Commits · 73931ba3420a131374624c1b7788d98bbf947b7f · Codecrew / Moya

31 Oct, 2012 5 commits

Merge branch 'newui' into newui-merge · 73931ba3
```
Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
```
Tuomas Riihimäki committed Oct 31, 2012
73931ba3 Browse Files
Le bugs · d404584a
Tuomas Riihimäki committed Oct 31, 2012

d404584a Browse Files
skynett-teema · 47453cc9
Petri Jarvisalo committed Oct 31, 2012

47453cc9 Browse Files

Merge branch 'newui' into newui-merge · 009a807d

Conflicts:
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardPrintBean.java
code/LanBortalWeb/WebContent/WEB-INF/web.xml
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserValidator.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java

committed Oct 31, 2012

009a807d Browse Files

map save bug · bcb6bbae
Tuomas Riihimäki committed Oct 31, 2012

bcb6bbae Browse Files

29 Oct, 2012 1 commit
- Eh.. jotain, vielä kun muistais mitä... · 75a86224
  Tuomas Riihimäki committed Oct 29, 2012
  
  75a86224
28 Oct, 2012 1 commit
- hurrdurr · 8a0b8812
  Petri Jarvisalo committed Oct 28, 2012
  
  8a0b8812
27 Oct, 2012 33 commits
- fix duplicate wave · f2af2991
  Riku Silvola committed Oct 27, 2012
  
  f2af2991
- Merge branch 'master' of codecrew.fi:bortal · e62700d0
  Tuomas Riihimäki committed Oct 27, 2012
  
  e62700d0 Browse Files
- BUG · 405f4311
  Tuomas Riihimäki committed Oct 27, 2012
  
  405f4311 Browse Files
- doublename · 128ded09
  Tuukka Kivilahti committed Oct 27, 2012
  
  128ded09 Browse Files
- foobar · 99d9a3b0
  Tuukka Kivilahti committed Oct 27, 2012
  
  99d9a3b0 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · b71673ee
  Tuukka Kivilahti committed Oct 27, 2012
  
  b71673ee Browse Files
- food description for foodwave · 62b695dd
  Tuukka Kivilahti committed Oct 27, 2012
  
  62b695dd Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 5fbd373f
  Riku Silvola committed Oct 27, 2012
  
  5fbd373f Browse Files
- i18n päivityksiä · 7ba7dfe3
  Riku Silvola committed Oct 27, 2012
  
  7ba7dfe3 Browse Files
- taaks · da375ecf
  Tuukka Kivilahti committed Oct 27, 2012
  
  da375ecf Browse Files
- Merge branch 'master' of codecrew.fi:bortal · f162f29f
  Antti Tönkyrä committed Oct 27, 2012
  
  f162f29f Browse Files
- reverse-jyräys :) · 653d2668
  Antti Tönkyrä committed Oct 27, 2012
  
  653d2668 Browse Files
- feedback · cb696282
  Tuomas Riihimäki committed Oct 27, 2012
  
  cb696282 Browse Files
- comment · 5d97b618
  Riku Silvola committed Oct 27, 2012
  
  5d97b618 Browse Files
- minor change to listfoodwave · e72f6cfb
  Riku Silvola committed Oct 27, 2012
  
  e72f6cfb Browse Files
- Merge branch 'master' of codecrew.fi:bortal into official · 03adad00
  Juho Juopperi committed Oct 27, 2012
  
  03adad00 Browse Files
- feedback model and facade · 864d0e0e
  Juho Juopperi committed Oct 27, 2012
  
  864d0e0e Browse Files
- Palautetta ja kuvia · 94d334a7
  Tuomas Riihimäki committed Oct 27, 2012
  
  94d334a7
- Merge branch 'master' of codecrew.fi:bortal · 38dcab89
```
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
  38dcab89 Browse Files
- Palautetta · abb72c29
  Tuomas Riihimäki committed Oct 27, 2012
  
  abb72c29
- Merge branch 'master' of codecrew.fi:bortal · 6fc0abed
  Tuukka Kivilahti committed Oct 27, 2012
  
  6fc0abed Browse Files
- foodwave can now be full · 91226116
  Tuukka Kivilahti committed Oct 27, 2012
  
  91226116 Browse Files
- i18n update for listfoodwave · 72b32b3a
  Riku Silvola committed Oct 27, 2012
  
  72b32b3a Browse Files
- Merge branch 'master' of codecrew.fi:bortal · c781ec17
  Tuukka Kivilahti committed Oct 27, 2012
  
  c781ec17 Browse Files
- reservedcount and sorting · dbf39565
  Tuukka Kivilahti committed Oct 27, 2012
  
  dbf39565 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · f0c6dfe6
  Riku Silvola committed Oct 27, 2012
  
  f0c6dfe6 Browse Files
- color foodwaves delivered · 8c4cfe8f
  Riku Silvola committed Oct 27, 2012
  
  8c4cfe8f Browse Files
- purkka · 354bd2f1
  Tuukka Kivilahti committed Oct 27, 2012
  
  354bd2f1 Browse Files
- Errorpagea · 2d17d211
  Tuomas Riihimäki committed Oct 27, 2012
  
  2d17d211 Browse Files
- conflict much? · 45a68f07
  Riku Silvola committed Oct 27, 2012
  
  45a68f07 Browse Files
- muutokset takas, kolomannen kerran · f4285348
  Tuukka Kivilahti committed Oct 27, 2012
  
  f4285348 Browse Files
- merge · ae395bec
  Tuukka Kivilahti committed Oct 27, 2012
  
  ae395bec Browse Files
- merge failed previoliously · 74a526ce
  Tuukka Kivilahti committed Oct 27, 2012
  
  74a526ce Browse Files