Commits · c31db398bc412691c3fe55d25ca5c60f4e74bc44 · Codecrew / Moya · GitLab

27 Oct, 2012 15 commits
- menu order and foodwave list · c31db398
  Riku Silvola committed Oct 27, 2012
  
  c31db398 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · e748081d
  Riku Silvola committed Oct 27, 2012
  
  e748081d Browse Files
- foodwavestuff · 395704b7
  Riku Silvola committed Oct 27, 2012
  
  395704b7 Browse Files
- Added buy in price · c01e8242
  Tuomas Riihimäki committed Oct 27, 2012
  
  c01e8242 Browse Files
- listfoodwaves shuffling · 7c6cc2c4
  Riku Silvola committed Oct 27, 2012
  
  7c6cc2c4 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 42a45fe3
  Riku Silvola committed Oct 27, 2012
  
  42a45fe3 Browse Files
- foodies · 7f918cb6
  Riku Silvola committed Oct 27, 2012
  
  7f918cb6 Browse Files
- foooooood. · 675f6be5
  Tuomas Riihimäki committed Oct 27, 2012
  
  675f6be5 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 078d6814
```
Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
```
  Tuomas Riihimäki committed Oct 27, 2012
  078d6814 Browse Files
- i18n... · 64f02431
  Tuomas Riihimäki committed Oct 27, 2012
  
  64f02431 Browse Files
- line delimiters · 21855fb7
  Riku Silvola committed Oct 27, 2012
  
  21855fb7
- Merge branch 'master' of codecrew.fi:bortal · 233dbbf4
```
Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
```
  Tuomas Riihimäki committed Oct 27, 2012
  233dbbf4 Browse Files
- hostnamefiltterin pathtrackeriä · 21fd8714
  Tuomas Riihimäki committed Oct 27, 2012
  
  21fd8714
- unpaidbills fix · 37e52a42
  Riku Silvola committed Oct 27, 2012
  
  37e52a42 Browse Files
- foodwaves · 31880a33
  Riku Silvola committed Oct 27, 2012
  
  31880a33 Browse Files
26 Oct, 2012 25 commits
- Merge branch 'master' of codecrew.fi:bortal · 6228cb68
  Tuomas Riihimäki committed Oct 26, 2012
  
  6228cb68 Browse Files
- Hurr.. Kaupan optimointia... · 8ee9667b
  Tuomas Riihimäki committed Oct 26, 2012
  
  8ee9667b Browse Files
- we need this · 6f12b1bb
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  6f12b1bb Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 1700c652
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  1700c652 Browse Files
- foodwave summary · 147bac3e
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  147bac3e
- Foodwave myyti · 698607d0
  Tuomas Riihimäki committed Oct 26, 2012
  
  698607d0
- . · 286953ad
  Tuomas Riihimäki committed Oct 26, 2012
  
  286953ad
- foodwavea. · d54d2781
  Tuomas Riihimäki committed Oct 26, 2012
  
  d54d2781 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · dc64db73
  Tuomas Riihimäki committed Oct 26, 2012
  
  dc64db73 Browse Files
- fasdf · 648b33da
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  648b33da Browse Files
- wavea · 006077c2
  Tuomas Riihimäki committed Oct 26, 2012
  
  006077c2 Browse Files
- foooood · ca8bb0dd
  Tuomas Riihimäki committed Oct 26, 2012
  
  ca8bb0dd Browse Files
- foo · 543f6031
  Tuomas Riihimäki committed Oct 26, 2012
  
  543f6031 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 311dcf23
  Tuomas Riihimäki committed Oct 26, 2012
  
  311dcf23 Browse Files
- untested · 07afd425
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  07afd425 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 87d8f64c
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  87d8f64c Browse Files
- bills for foodwaves · af57bbd5
  Tuukka Kivilahti, TKffTK committed Oct 26, 2012
  
  af57bbd5 Browse Files
- Shoppia · 7a8c9d73
```
Conflicts:
	code/LanBortalWeb/WebContent/resources/cditools/user/create.xhtml
	code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java
```
  Tuomas Riihimäki committed Oct 26, 2012
  7a8c9d73 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 6ccbd31f
  Riku Silvola committed Oct 26, 2012
  
  6ccbd31f Browse Files
- beautify user foodwave and update locales · 1edd3b9f
  Riku Silvola committed Oct 26, 2012
  
  1edd3b9f
- Merge branch 'master' of codecrew.fi:bortal · 5121e6f8
  Tuomas Riihimäki committed Oct 26, 2012
  
  5121e6f8 Browse Files
- Bill foodwave payment check · 7b399077
  Tuomas Riihimäki committed Oct 26, 2012
  
  7b399077 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · ab9d6a3c
  Riku Silvola committed Oct 26, 2012
  
  ab9d6a3c Browse Files
- foodwave, foodmanager, i18n changes · ae5d3663
  Riku Silvola committed Oct 26, 2012
  
  ae5d3663 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 454f7c0e
  Tuomas Riihimäki committed Oct 26, 2012
  
  454f7c0e Browse Files