Commits · 7adfcabf3fa406c5973974e5977c2f996d2282a5 · Codecrew / Moya · GitLab

13 May, 2012 2 commits
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 7adfcabf
  Tuomas Riihimäki committed May 13, 2012
  
  7adfcabf Browse Files
- Hups.. stackoverflow · e2d1d308
  Tuomas Riihimäki committed May 13, 2012
  
  e2d1d308 Browse Files
12 May, 2012 38 commits
- OrgRole to Role mapping · 9fe3835f
  Juho Juopperi committed May 12, 2012
  
  9fe3835f Browse Files
- OrgRole and OrgRoleFacade · 4109b346
  Juho Juopperi committed May 12, 2012
  
  4109b346 Browse Files
- Le fix... · e09f6ef3
  Tuomas Riihimäki committed May 12, 2012
  
  e09f6ef3 Browse Files
- Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser · 8901b274
  Tuomas Riihimäki committed May 12, 2012
  
  8901b274 Browse Files
- lefix · 90c4bd07
  Tuomas Riihimäki committed May 12, 2012
  
  90c4bd07
- le fix · 4fa18554
  Juho Juopperi committed May 12, 2012
  
  4fa18554 Browse Files
- le fix · f5d994c3
  Juho Juopperi committed May 12, 2012
  
  f5d994c3
- 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 Browse Files
- 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