Commits · ff9f9aad2186f20b437e08b04e844f6da0ff2bdb · Antti Väyrynen / Moya

07 Oct, 2012 6 commits

Menustuff · ff9f9aad
Petri Järvisalo committed Oct 07, 2012

ff9f9aad Browse Files
Primefaces menujuttuja · f1577fdc
Tuomas Riihimäki committed Oct 07, 2012

f1577fdc
template sätöstelyä · 2fe28fb6
Petri Järvisalo committed Oct 07, 2012

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

cb03c4fb Browse Files

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

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

28ae8c9d Browse Files

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

55dbaf86 Browse Files

06 Oct, 2012 34 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 Browse Files
- Hurr.. model/*_.java gitignoreen · 8d8da25d
  Tuomas Riihimäki committed Oct 06, 2012
  
  8d8da25d Browse Files
- forgot to press ctrl+s · e6756258
  Antti Tönkyrä committed Oct 06, 2012
  
  e6756258
- Add hello & ICommandLineInterface · e048398b
  Antti Tönkyrä committed Oct 06, 2012
  
  e048398b
- 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
- 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
- siirretty glassfish-setup wikiin · 1f389081
  Juho Juopperi committed Oct 06, 2012
  
  1f389081 Browse Files
- glassfish-asennus · 1e3747fc
  Juho Juopperi committed Oct 06, 2012
  
  1e3747fc Browse Files
- uppercasifying fixes · e58d440f
  Antti Tönkyrä committed Oct 06, 2012
  
  e58d440f
- renames · 354ae6de
  Antti Tönkyrä committed Oct 06, 2012
  
  354ae6de Browse Files
- suppresswarning · f3805553
  Juho Juopperi committed Oct 06, 2012
  
  f3805553 Browse Files
- suppresswarning · 0f284fc2
  Juho Juopperi committed Oct 06, 2012
  
  0f284fc2
- unused logger suppresswarnings · de5b1b9d
  Juho Juopperi committed Oct 06, 2012
  
  de5b1b9d
- fix warnings · 1d5274bf
  Juho Juopperi committed Oct 06, 2012
  
  1d5274bf
- imports · 5ce78779
  Juho Juopperi committed Oct 06, 2012
  
  5ce78779 Browse Files
- imports · 188fc699
  Juho Juopperi committed Oct 06, 2012
  
  188fc699
- imports · 42204fe6
  Juho Juopperi committed Oct 06, 2012
  
  42204fe6 Browse Files
- imports · ffe19153
  Juho Juopperi committed Oct 06, 2012
  
  ffe19153
- imports · 3e46f5b9
  Juho Juopperi committed Oct 06, 2012
  
  3e46f5b9
- logic bug · cd23bcbd
  Juho Juopperi committed Oct 06, 2012
  
  cd23bcbd Browse Files
- ungeneralize type · 06d2196e
  Juho Juopperi committed Oct 06, 2012
  
  06d2196e
- make it compile · 7aa09958
  Juho Juopperi committed Oct 06, 2012
  
  7aa09958 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 7d3c93fe
  Juho Juopperi committed Oct 06, 2012
  
  7d3c93fe Browse Files
- fix jsf errors · c586a8ac
  Juho Juopperi committed Oct 06, 2012
  
  c586a8ac
- Merge branch 'master' of codecrew.fi:bortal · 71e44b57
```
Conflicts:
	code/LanBortalWeb/WebContent/WEB-INF/web.xml
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodShopView.java
```
  Tuomas Riihimäki committed Oct 06, 2012
  71e44b57 Browse Files
- Foodwavea. · 4e4b9d82
  Tuomas Riihimäki committed Oct 06, 2012
  
  4e4b9d82 Browse Files
- etusivulle muutoksia... · 3e3852ef
  Petri Järvisalo committed Oct 06, 2012
  
  3e3852ef Browse Files
- fix jsf warnings · 5730f5af
  Juho Juopperi committed Oct 06, 2012
  
  5730f5af