Commits · 46ee04359f9cd4e3c1fa71ff036bd2b6d1868878 · Linnea Samila / Moya

23 Oct, 2012 10 commits
- err_id · 46ee0435
  Riku Silvola committed Oct 23, 2012
  
  46ee0435 Browse Files
- errors · 84419f03
  Riku Silvola committed Oct 23, 2012
  
  84419f03 Browse Files
- Mergefiksauksia. · d6e5b3f7
  Tuomas Riihimäki committed Oct 23, 2012
  
  d6e5b3f7 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 9ab32952
```
Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveTemplateFacade.java
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
```
  Tuomas Riihimäki committed Oct 23, 2012
  9ab32952
- foodwavea.. · a732e5d7
  Tuomas Riihimäki committed Oct 23, 2012
  
  a732e5d7 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 03f90098
  Tuukka Kivilahti, TKffTK committed Oct 23, 2012
  
  03f90098 Browse Files
- can I haz foodwaves??? · 28e56178
  Tuukka Kivilahti, TKffTK committed Oct 23, 2012
  
  28e56178 Browse Files
- additional fixes · 86e51802
  Antti Tönkyrä committed Oct 23, 2012
  
  86e51802 Browse Files
- + Add x/maxx to cart · dee782ad
```
+ Remove previous if first user in cart
+ Remove next if last user in cart
+ Add mass print feature
```
  Antti Tönkyrä committed Oct 23, 2012
  dee782ad Browse Files
- UserCart uutena käsitteenä. Kaikkea pientä kivaa · 7851fd15
  Tuomas Riihimäki committed Oct 23, 2012
  
  7851fd15
19 Oct, 2012 2 commits
- Merge branch 'master' of codecrew.fi:bortal · 888c50fb
  Tuukka Kivilahti, TKffTK committed Oct 19, 2012
  
  888c50fb Browse Files
- foobar · a52a96b0
  Tuukka Kivilahti, TKffTK committed Oct 19, 2012
  
  a52a96b0 Browse Files
18 Oct, 2012 3 commits
- Merge branch 'master' of codecrew.fi:bortal · aed31d97
  Tuomas Riihimäki committed Oct 18, 2012
  
  aed31d97 Browse Files
- Missing files.. · 29f2c6fb
  Tuomas Riihimäki committed Oct 18, 2012
  
  29f2c6fb Browse Files
- Searching may return eventuser instead of user... · dc66d756
  Tuomas Riihimäki committed Oct 18, 2012
  
  dc66d756
17 Oct, 2012 3 commits
- Added initial Card printer product · 9c46e49d
  Tuomas Riihimäki committed Oct 17, 2012
  
  9c46e49d
- Added Automatic product for Reader · 9c133387
  Tuomas Riihimäki committed Oct 17, 2012
  
  9c133387 Browse Files
- Reverted shopToUser.xhtml · dfe5e1e0
  Tuomas Riihimäki committed Oct 17, 2012
  
  dfe5e1e0
07 Oct, 2012 7 commits

Merge branch 'master' of codecrew.fi:bortal · 6249c3aa

Conflicts:
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java

committed Oct 07, 2012

6249c3aa Browse Files

foodwave list · a0290f82
Riku Silvola committed Oct 07, 2012

a0290f82 Browse Files
bug-xxx · 5a6395fe
Tuukka Kivilahti, TKffTK committed Oct 07, 2012

5a6395fe
Removed generated entitystuff.. · dd9ffa70
Tuomas Riihimäki committed Oct 07, 2012

dd9ffa70 Browse Files
Deleted images.. · cb03c4fb
Petri Järvisalo committed Oct 07, 2012

cb03c4fb Browse Files

Merge branch 'master' of codecrew.fi:bortal · 28ae8c9d

committed Oct 07, 2012

28ae8c9d Browse Files

rikoin ui:n, toisin tuon default, insomnia ui ok. · 55dbaf86
Petri Järvisalo committed Oct 07, 2012

55dbaf86

06 Oct, 2012 15 commits
- Merge branch 'master' of codecrew.fi:bortal · c09c5938
  Juho Juopperi committed Oct 06, 2012
  
  c09c5938 Browse Files
- pdf for usercardservlet · f7ce60c7
  Juho Juopperi committed Oct 06, 2012
  
  f7ce60c7
- Hurr.. model/*_.java gitignoreen · 8d8da25d
  Tuomas Riihimäki committed Oct 06, 2012
  
  8d8da25d Browse Files
- Merge branch 'master' of codecrew.fi:bortal · f53e97ea
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  f53e97ea Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 2f47f63b
```
Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
```
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  2f47f63b Browse Files
- forgot to press ctrl+s · e6756258
  Antti Tönkyrä committed Oct 06, 2012
  
  e6756258 Browse Files
- Add hello & ICommandLineInterface · e048398b
  Antti Tönkyrä committed Oct 06, 2012
  
  e048398b
- local random commit · 6c2bd349
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  6c2bd349
- Merge branch 'master' of codecrew.fi:bortal · c4a84f14
  Antti Tönkyrä committed Oct 06, 2012
  
  c4a84f14 Browse Files
- Add logincontext to localcontextholder · 031df250
  Antti Tönkyrä committed Oct 06, 2012
  
  031df250 Browse Files
- Foodwavejuttuja ja useredittiä. · 71b73b1a
  Tuomas Riihimäki committed Oct 06, 2012
  
  71b73b1a Browse Files
- bugfix · 81b321b0
  Juho Juopperi committed Oct 06, 2012
  
  81b321b0 Browse Files
- a bug · dfee74e1
  Juho Juopperi committed Oct 06, 2012
  
  dfee74e1 Browse Files
- forced reconfiguration of mail: https://wiki.codecrew.fi/doku.php?id=glassfish-asennus · a89daf21
  Juho Juopperi committed Oct 06, 2012
  
  a89daf21
- Merge branch 'master' of codecrew.fi:bortal · c9c085f7
  Juho Juopperi committed Oct 06, 2012
  
  c9c085f7 Browse Files