Commits · a843611ae0c057b6af619d7a52332427cef5e197 · Codecrew / Moya · GitLab

24 Oct, 2012 35 commits
- Merge branch 'master' of codecrew.fi:bortal · a843611a
  Tuomas Riihimäki committed Oct 24, 2012
  
  a843611a Browse Files
- Merge branch 'master' of codecrew.fi:bortal · e2967700
  Antti Tönkyrä committed Oct 24, 2012
  
  e2967700 Browse Files
- print user stuff @ send picture page using new code · abbcf698
  Antti Tönkyrä committed Oct 24, 2012
  
  abbcf698
- error handling · bd79cb55
  Riku Silvola committed Oct 24, 2012
  
  bd79cb55 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 18eb8de1
  Tuukka Kivilahti committed Oct 24, 2012
  
  18eb8de1 Browse Files
- kieliä · 35b32b41
  Tuukka Kivilahti committed Oct 24, 2012
  
  35b32b41
- i18n fixes · 4f849d26
  Antti Tönkyrä committed Oct 24, 2012
  
  4f849d26 Browse Files
- buttoneilta default ajax pois. · 1a2237f0
  Tuomas Riihimäki committed Oct 24, 2012
  
  1a2237f0 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · df3d4305
  Tuomas Riihimäki committed Oct 24, 2012
  
  df3d4305 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 040cd926
  Antti Tönkyrä committed Oct 24, 2012
  
  040cd926 Browse Files
- image cropping fixes · b1f7f367
```
adjust image aspect ratio to 0.7317073170731707
```
  Antti Tönkyrä committed Oct 24, 2012
  b1f7f367
- Merge branch 'master' of codecrew.fi:bortal · 86c88cdf
  Tuomas Riihimäki committed Oct 24, 2012
  
  86c88cdf Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 18458a23
  Riku Silvola committed Oct 24, 2012
  
  18458a23 Browse Files
- i18 muutoksia ja error logger · 000deb8c
  Riku Silvola committed Oct 24, 2012
  
  000deb8c
- actionlog as menuitem · ad84ff38
  Antti Tönkyrä committed Oct 24, 2012
  
  ad84ff38 Browse Files
- forgot something · 7fb98ce1
  Antti Tönkyrä committed Oct 24, 2012
  
  7fb98ce1 Browse Files
- Mass print stuff · f2a619e2
  Antti Tönkyrä committed Oct 24, 2012
  
  f2a619e2 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 5345e25e
  Tuomas Riihimäki committed Oct 24, 2012
  
  5345e25e Browse Files
- Merge branch 'master' of codecrew.fi:bortal · d2632cb9
  Antti Tönkyrä committed Oct 24, 2012
  
  d2632cb9 Browse Files
- printage · 41ba50bd
  Antti Tönkyrä committed Oct 24, 2012
  
  41ba50bd Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 4aaf3008
  Tuomas Riihimäki committed Oct 24, 2012
  
  4aaf3008 Browse Files
- . · 12f812d8
  Tuomas Riihimäki committed Oct 24, 2012
  
  12f812d8 Browse Files
- error update · e82919b4
  Riku Silvola committed Oct 24, 2012
  
  e82919b4 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · dae12791
  Tuukka Kivilahti, TKffTK committed Oct 24, 2012
  
  dae12791 Browse Files
- aikajutukkeita · 859a4e99
  Tuukka Kivilahti, TKffTK committed Oct 24, 2012
  
  859a4e99
- Merge branch 'master' of codecrew.fi:bortal · b6312dc5
  Antti Tönkyrä committed Oct 24, 2012
  
  b6312dc5 Browse Files
- fix conversation propagation · cb3a854c
  Antti Tönkyrä committed Oct 24, 2012
  
  cb3a854c Browse Files
- i18n judui · 5cd12a1b
  Riku Silvola committed Oct 24, 2012
  
  5cd12a1b Browse Files
- Merge branch 'master' of codecrew.fi:bortal · ebc6c46a
  Antti Tönkyrä committed Oct 24, 2012
  
  ebc6c46a Browse Files
- add missing xhtml · 217c0a71
  Antti Tönkyrä committed Oct 24, 2012
  
  217c0a71 Browse Files
- lokalisaatio päivityksiä · 256a4359
  Riku Silvola committed Oct 24, 2012
  
  256a4359 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 2632922d
  Riku Silvola committed Oct 24, 2012
  
  2632922d Browse Files
- i18_insomnia scripti · 3d04c856
  Riku Silvola committed Oct 24, 2012
  
  3d04c856 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 9f1a002e
  Tuukka Kivilahti, TKffTK committed Oct 24, 2012
  
  9f1a002e Browse Files
- lol, dunno what · 4b2a13bc
  Tuukka Kivilahti, TKffTK committed Oct 24, 2012
  
  4b2a13bc
23 Oct, 2012 5 commits
- i18 scripti · 8e814fa4
  Riku Silvola committed Oct 23, 2012
  
  8e814fa4 Browse Files
- 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 Browse Files