Commits · e9399338a831dfa0ec714935a5ad2e693aa2a005 · Antti Väyrynen / Moya · GitLab

13 May, 2012 17 commits
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · e9399338
  Juho Juopperi committed May 13, 2012
  
  e9399338 Browse Files
- beginning of orgrole editor · 31ea94b1
  Juho Juopperi committed May 13, 2012
  
  31ea94b1 Browse Files
- Hups.. jäi yksi beani muokkaamatta · 5df81ffa
  Tuomas Riihimäki committed May 13, 2012
  
  5df81ffa Browse Files
- User vai eventuser-id säätöä · 6a157d33
  Tuomas Riihimäki committed May 13, 2012
  
  6a157d33
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · 0bdb53ee
  Tuomas Riihimäki committed May 13, 2012
  
  0bdb53ee Browse Files
- orgrole puljaus · 1bbb6be2
  Tuomas Riihimäki committed May 13, 2012
  
  1bbb6be2
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · e01439e0
  Juho Salli committed May 13, 2012
  
  e01439e0 Browse Files
- jotain · 64ced6ee
  Juho Salli committed May 13, 2012
  
  64ced6ee Browse Files
- Loop de loop fix · a49cf635
  Tuomas Riihimäki committed May 13, 2012
  
  a49cf635 Browse Files
- OrgRole and Role ManyToMany · 2b75e123
  Juho Juopperi committed May 13, 2012
  
  2b75e123
- column -> joincolumn.. · 267cc600
  Tuomas Riihimäki committed May 13, 2012
  
  267cc600 Browse Files
- Merge branch 'eventuser' · 6645ef86
```
Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java
```
  Juho Juopperi committed May 13, 2012
  6645ef86 Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · f7eed6bc
  Juho Salli committed May 13, 2012
  
  f7eed6bc Browse Files
- CompoPermission ja compoview juttui · 002a3bbc
  Juho Salli committed May 13, 2012
  
  002a3bbc Browse Files
- VotingBean functionality · d0648abc
  Antti Tonkyra committed May 13, 2012
  
  d0648abc Browse Files
- 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 23 commits
- OrgRole to Role mapping · 9fe3835f
  Juho Juopperi committed May 12, 2012
  
  9fe3835f Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · 23492e84
  Antti Tonkyra committed May 12, 2012
  
  23492e84 Browse Files
- More work on compo entry adding · df5040eb
  Antti Tonkyra committed May 12, 2012
  
  df5040eb Browse Files
- Compolistaus toimii · ca494e1c
  Juho Salli committed May 12, 2012
  
  ca494e1c Browse Files
- OrgRole and OrgRoleFacade · 4109b346
  Juho Juopperi committed May 12, 2012
  
  4109b346 Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · 7e8a04f3
  Juho Salli committed May 12, 2012
  
  7e8a04f3 Browse Files
- Ei mitään · 45a87859
  Juho Salli committed May 12, 2012
  
  45a87859 Browse Files
- Merge branch 'master' of dev.insomnia.fi:/data/bortal · dceb91a2
```
Conflicts:
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java
```
  Antti Tonkyra committed May 12, 2012
  dceb91a2 Browse Files
- Compolist-juttuja · eda91b75
  Juho Salli committed May 12, 2012
  
  eda91b75 Browse Files
- Entry adding · bc2924ff
  Antti Tonkyra committed May 12, 2012
  
  bc2924ff
- 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 Browse Files
- 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 Browse Files
- 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