Commits · 536059815d90f2be7f4c194b5317d4729b2be6f0 · Antti Väyrynen / Moya · GitLab

26 Oct, 2012 2 commits
- Merge branch 'master' of codecrew.fi:bortal · 53605981
  Riku Silvola committed Oct 26, 2012
  
  53605981 Browse Files
- lokalisaatioita · 3a6fd459
  Riku Silvola committed Oct 26, 2012
  
  3a6fd459 Browse Files
25 Oct, 2012 38 commits
- foodmanager · 19c1ff88
  Tuukka Kivilahti, TKffTK committed Oct 25, 2012
  
  19c1ff88 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 7d3b0ab0
```
Conflicts:
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
```
  Tuukka Kivilahti, TKffTK committed Oct 25, 2012
  7d3b0ab0 Browse Files
- aaltoja, aaltoja · 9066cb2c
  Tuukka Kivilahti, TKffTK committed Oct 25, 2012
  
  9066cb2c Browse Files
- foodwavetemplate localei · d27bb797
  Riku Silvola committed Oct 25, 2012
  
  d27bb797 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 5a281a03
```
Conflicts:
	code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
```
  Antti Tönkyrä committed Oct 25, 2012
  5a281a03 Browse Files
- foodwave created · 19207f5a
  Antti Tönkyrä committed Oct 25, 2012
  
  19207f5a Browse Files
- i18n judui template creatoriin · 7393ab53
  Riku Silvola committed Oct 25, 2012
  
  7393ab53 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 9da32beb
  Riku Silvola committed Oct 25, 2012
  
  9da32beb Browse Files
- foodwaveTemplateEditor locales · 2dd46485
  Riku Silvola committed Oct 25, 2012
  
  2dd46485 Browse Files
- createtemplate deving · 21870786
  Antti Tönkyrä committed Oct 25, 2012
  
  21870786 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · eb860c94
```
Conflicts:
	code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
```
  Antti Tönkyrä committed Oct 25, 2012
  eb860c94 Browse Files
- foodwave creation.. · c2c785f2
  Antti Tönkyrä committed Oct 25, 2012
  
  c2c785f2 Browse Files
- createTemplate validation · 94afee8d
  Riku Silvola committed Oct 25, 2012
  
  94afee8d Browse Files
- wtf? · 26b73604
  Antti Tönkyrä committed Oct 25, 2012
  
  26b73604 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · ea0d6513
  Antti Tönkyrä committed Oct 25, 2012
  
  ea0d6513 Browse Files
- ct dev · be6a6052
  Antti Tönkyrä committed Oct 25, 2012
  
  be6a6052 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 45ef301c
  Tuomas Riihimäki committed Oct 25, 2012
  
  45ef301c Browse Files
- Product descr + foodwavestuff · 73158b8a
  Tuomas Riihimäki committed Oct 25, 2012
  
  73158b8a Browse Files
- Merge branch 'master' of codecrew.fi:bortal · ee917ef4
  Riku Silvola committed Oct 25, 2012
  
  ee917ef4 Browse Files
- clear now returns null string · 7e7d27ae
  Riku Silvola committed Oct 25, 2012
  
  7e7d27ae Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 6599c10a
  Antti Tönkyrä committed Oct 25, 2012
  
  6599c10a Browse Files
- begin work on foodwaveview · 623579ea
  Antti Tönkyrä committed Oct 25, 2012
  
  623579ea Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 788b6bdd
  Tuomas Riihimäki committed Oct 25, 2012
  
  788b6bdd Browse Files
- Allow admin to create user without validators.. · 35db1aa9
  Tuomas Riihimäki committed Oct 25, 2012
  
  35db1aa9 Browse Files
- Loosen usercreate stuff for admins · 8bea3338
  Tuomas Riihimäki committed Oct 25, 2012
  
  8bea3338 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 76da913a
  Tuukka Kivilahti committed Oct 25, 2012
  
  76da913a Browse Files
- properties are nice · 071044bb
  Tuukka Kivilahti committed Oct 25, 2012
  
  071044bb Browse Files
- formatter and other stuff · 9346cd56
  Tuukka Kivilahti, TKffTK committed Oct 25, 2012
  
  9346cd56 Browse Files
- Added codecrew-formatter · 84e77079
  Tuomas Riihimäki committed Oct 25, 2012
  
  84e77079
- Merge branch 'master' of codecrew.fi:bortal · 7d22508c
  Antti Tönkyrä committed Oct 25, 2012
  
  7d22508c Browse Files
- user card print -> rfid flow should work normally now · 2d07822b
  Antti Tönkyrä committed Oct 25, 2012
  
  2d07822b Browse Files
- fix dev mode error · 0af7b2aa
  Riku Silvola committed Oct 25, 2012
  
  0af7b2aa Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 66bb4207
  Tuomas Riihimäki committed Oct 25, 2012
  
  66bb4207 Browse Files
- Menujuttuja · 590657c2
  Tuomas Riihimäki committed Oct 25, 2012
  
  590657c2 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 1c31c324
  Antti Tönkyrä committed Oct 25, 2012
  
  1c31c324 Browse Files
- erge branch 'master' of codecrew.fi:bortal · 3b915a6b
  Tuomas Riihimäki committed Oct 25, 2012
  
  3b915a6b Browse Files
- kek · d72ce1cb
  Riku Silvola committed Oct 25, 2012
  
  d72ce1cb Browse Files
- fix card flush · 53ceb6c1
  Antti Tönkyrä committed Oct 25, 2012
  
  53ceb6c1 Browse Files