Commits · c4a84f1468f1d45dab5c903261c4de5d49504afb · Codecrew / Moya

06 Oct, 2012 38 commits
- 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
- 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
- suppresswarning · 0f284fc2
  Juho Juopperi committed Oct 06, 2012
  
  0f284fc2 Browse Files
- 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
- 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 Browse Files
- imports · 3e46f5b9
  Juho Juopperi committed Oct 06, 2012
  
  3e46f5b9 Browse Files
- logic bug · cd23bcbd
  Juho Juopperi committed Oct 06, 2012
  
  cd23bcbd Browse Files
- ungeneralize type · 06d2196e
  Juho Juopperi committed Oct 06, 2012
  
  06d2196e Browse Files
- make it compile · 7aa09958
  Juho Juopperi committed Oct 06, 2012
  
  7aa09958
- 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 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · fb55fae7
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  fb55fae7 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 558d52a0
```
Conflicts:
	code/LanBortalWeb/WebContent/permissionDenied.xhtml
	code/LanBortalWeb/WebContent/resources/cditools/bills/list.xhtml
```
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  558d52a0 Browse Files
- generated stuff · becb1269
  Juho Juopperi committed Oct 06, 2012
  
  becb1269 Browse Files
- can haz · 139d54b3
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  139d54b3
- java7 -> java6 build ent · b8065ab6
  Juho Juopperi committed Oct 06, 2012
  
  b8065ab6
- Merge branch 'master' of codecrew.fi:bortal · 22cfdbac
```
Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapManageView.java
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/AuthView.java
```
  Juho Juopperi committed Oct 06, 2012
  22cfdbac Browse Files
- fix · 5d752d89
  Juho Juopperi committed Oct 06, 2012
  
  5d752d89 Browse Files
- can haz save · 42a59ade
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  42a59ade
- fix jsf errors · 2ae1f001
  Juho Juopperi committed Oct 06, 2012
  
  2ae1f001
04 Oct, 2012 2 commits
- Moved BarcodeBean to utils and renamed to BarcodeUtils · 20c3a322
  Tuomas Riihimäki committed Oct 04, 2012
  
  20c3a322
- Merge branch 'master' of codecrew.fi:bortal · 386610f4
```
Conflicts:
	code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml
```
  Tuomas Riihimäki committed Oct 04, 2012
  386610f4 Browse Files