Commits · 85fd65b634d77cc21cedf46222d49adb8ccf16c8 · Codecrew / Moya · GitLab

12 May, 2012 40 commits
- le fix · 85fd65b6
  Juho Juopperi committed May 12, 2012
  
  85fd65b6 Browse Files
- le fix · 5a7124c9
  Tuomas Riihimäki committed May 12, 2012
  
  5a7124c9
- fixing beans · 21bd2932
  Juho Juopperi committed May 12, 2012
  
  21bd2932
- fixed it · edf867c4
  Juho Juopperi committed May 12, 2012
  
  edf867c4 Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 4cce2e7b
  Juho Juopperi committed May 12, 2012
  
  4cce2e7b Browse Files
- broken code · 58e23aae
  Juho Juopperi committed May 12, 2012
  
  58e23aae Browse Files
- Mergeee · cb611cdf
  Tuomas Riihimäki committed May 12, 2012
  
  cb611cdf Browse Files
- eventuserfiksauksia · afc9cb8a
  Tuomas Riihimäki committed May 12, 2012
  
  afc9cb8a Browse Files
- card template · 5f45410b
  Juho Juopperi committed May 12, 2012
  
  5f45410b Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · ae89b919
  Juho Juopperi committed May 12, 2012
  
  ae89b919 Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 9714ebc9
  Tuomas Riihimäki committed May 12, 2012
  
  9714ebc9 Browse Files
- CardTemplate · 7eea84ad
  Juho Juopperi committed May 12, 2012
  
  7eea84ad Browse Files
- Userbeania, ym.. · 81b52062
  Tuomas Riihimäki committed May 12, 2012
  
  81b52062
- billbean · 1ef4679f
  Juho Juopperi committed May 12, 2012
  
  1ef4679f Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 90f160d1
  Juho Juopperi committed May 12, 2012
  
  90f160d1 Browse Files
- placebean · 852abd46
  Juho Juopperi committed May 12, 2012
  
  852abd46 Browse Files
- merge · d2560cb6
  Tuomas Riihimäki committed May 12, 2012
  
  d2560cb6 Browse Files
- Userbea eventuser-stuff · 96d55ecb
  Tuomas Riihimäki committed May 12, 2012
  
  96d55ecb Browse Files
- AccountEventBean · d1b6de18
  Juho Juopperi committed May 12, 2012
  
  d1b6de18 Browse Files
- forgot · f6d0f3f3
  Juho Juopperi committed May 12, 2012
  
  f6d0f3f3 Browse Files
- permbean · e9411e2f
  Juho Juopperi committed May 12, 2012
  
  e9411e2f Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 1db08517
```
Conflicts:
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote.java
```
  Juho Juopperi committed May 12, 2012
  1db08517 Browse Files
- Lime in the coconut · c0a45173
  Juho Juopperi committed May 12, 2012
  
  c0a45173
- Eventuser entitymuutokset · 069d20a8
  Tuomas Riihimäki committed May 12, 2012
  
  069d20a8
- Eventuser päivitystä · 79ff9107
  Tuomas Riihimäki committed May 12, 2012
  
  79ff9107 Browse Files
- Eventuserstuff · 0f381060
```
RIKOTAAN KAIKKI!!!
```
  Tuomas Riihimäki committed May 12, 2012
  0f381060 Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · 91e9c541
  Antti Tonkyra committed May 12, 2012
  
  91e9c541 Browse Files
- Vote stuff · 1e6c8df6
  Antti Tonkyra committed May 12, 2012
  
  1e6c8df6 Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · d79a313d
  Juho Juopperi committed May 12, 2012
  
  d79a313d Browse Files
- Salespoint List View · 31418a0f
  Juho Juopperi committed May 12, 2012
  
  31418a0f
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · 74c80ebc
  Juho Salli committed May 12, 2012
  
  74c80ebc Browse Files
- RFID-shop-juttuja · 8e6e91fd
  Tuomas Riihimäki committed May 12, 2012
  
  8e6e91fd Browse Files
- Compocreate UI toimii · 36cd54be
  Juho Salli committed May 12, 2012
  
  36cd54be Browse Files
- Voting stuffs & compo creation · d9a31b19
  Antti Tonkyra committed May 12, 2012
  
  d9a31b19 Browse Files
- Fix classpath for non-macs · 4a14f835
  Antti Tonkyra committed May 12, 2012
  
  4a14f835 Browse Files
- missing platform file · c1253309
  Juho Juopperi committed May 12, 2012
  
  c1253309
- Compojuttuja, createsivun UI about kunnossa · 54411aa0
```
Conflicts:

	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoFacade.java
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
```
  Juho committed May 12, 2012
  54411aa0 Browse Files
- Mostly layout and i18n changes · 394bb408
  Tuomas Riihimäki committed May 12, 2012
  
  394bb408
- Poistettu User-oliosta mappaukset metodeihin joihin ei pidä päästä käsiksi suoraa... · c22dd581
  Tuomas Riihimäki committed May 12, 2012
  
  c22dd581
- Initial stream version... · 548f4f2c
```
There I fixed it....
```
  Tuomas Riihimäki committed May 12, 2012
  548f4f2c