Commits · 69d1e7311fdcad58c6af2372f5ef00a232350ac8 · Antti Väyrynen / Moya · GitLab

11 Jun, 2010 1 commit
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · 69d1e731
  Tuukka Kivilahti committed Jun 11, 2010
  
  69d1e731 Browse Files
21 May, 2010 1 commit
- uh, I forgot one · 12fbbb8b
  Tuukka Kivilahti committed May 21, 2010
  
  12fbbb8b Browse Files
09 May, 2010 25 commits
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · b35272de
  Juho Juopperi committed May 09, 2010
  
  b35272de Browse Files
- Predefined roles · 86601d14
  Juho Juopperi committed May 09, 2010
  
  86601d14 Browse Files
- imports, imports · 47c09beb
  Tuukka Kivilahti committed May 09, 2010
  
  47c09beb Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · 9721594f
```
Conflicts:
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
	code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
```
  Tuukka Kivilahti committed May 09, 2010
  9721594f Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · 9c91723f
  Juho Juopperi committed May 09, 2010
  
  9c91723f Browse Files
- ok, now it works, you can test it now. If it does not work, its your fault · cd258e9b
  Tuukka Kivilahti committed May 09, 2010
  
  cd258e9b Browse Files
- Mergechanges · 90f3a3b1
  Tuomas Riihimäki committed May 09, 2010
  
  90f3a3b1 Browse Files
- sample links · d118aa2d
  Juho Juopperi committed May 09, 2010
  
  d118aa2d Browse Files
- Role stuff. · c555a872
  Tuomas Riihimäki committed May 09, 2010
  
  c555a872 Browse Files
- this will not work, don't try this, I'm just commiting my status (not pushing, s… · d0093a9b
```
…o when you get this code, it should "work").
```
  Tuukka Kivilahti committed May 09, 2010
  d0093a9b Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · 80dd17e4
  Tuukka Kivilahti committed May 09, 2010
  
  80dd17e4 Browse Files
- dunno what? · 2a23585b
  Tuukka Kivilahti committed May 09, 2010
  
  2a23585b Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · dbbc24c7
  Juho Juopperi committed May 09, 2010
  
  dbbc24c7 Browse Files
- compoentry reference bug · c574b2ab
  Juho Juopperi committed May 09, 2010
  
  c574b2ab Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · a0ae368f
  Tuukka Kivilahti committed May 09, 2010
  
  a0ae368f Browse Files
- picture magic, wtf? · 6414acfa
  Tuukka Kivilahti committed May 09, 2010
  
  6414acfa
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · c72a525f
```
Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java
```
  Juho Juopperi committed May 09, 2010
  c72a525f Browse Files
- compo test data - broken · 239ffb98
  Juho Juopperi committed May 09, 2010
  
  239ffb98 Browse Files
- Muutettu persistence cache pois päältä ja jotain muuta pientä viilausta.. · 48a14a49
  Tuomas Riihimäki committed May 09, 2010
  
  48a14a49 Browse Files
- Mergetty juttuja · c0ce1592
  Tuomas Riihimäki committed May 09, 2010
  
  c0ce1592 Browse Files
- Testidataa, JAAS kikkailua, ja muuta jännää. :) · e851e7b0
  Tuomas Riihimäki committed May 09, 2010
  
  e851e7b0 Browse Files
- statuses · 95269df6
  Juho Juopperi committed May 09, 2010
  
  95269df6 Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · f7167f4e
```
Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java
```
  Tuukka Kivilahti committed May 09, 2010
  f7167f4e Browse Files
- Just some testing stuff, nothing to see here.. · 611a31e5
```
...really.
```
  Tuukka Kivilahti committed May 09, 2010
  611a31e5 Browse Files
- permissions · 0b441544
  Juho Juopperi committed May 09, 2010
  
  0b441544 Browse Files
08 May, 2010 13 commits
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · b9e32f32
  Juho Juopperi committed May 08, 2010
  
  b9e32f32 Browse Files
- some index links · bf3513e2
  Juho Juopperi committed May 08, 2010
  
  bf3513e2 Browse Files
- Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal · fa99d550
  Tuomas Riihimäki committed May 08, 2010
  
  fa99d550 Browse Files
- moar event statuses · 742305e4
  Juho Juopperi committed May 08, 2010
  
  742305e4 Browse Files
- minor changes · abe66614
  Juho Juopperi committed May 08, 2010
  
  abe66614 Browse Files
- Removed unused imports v3 · 22010634
  Tuomas Riihimäki committed May 08, 2010
  
  22010634 Browse Files
- Removed unused imports v2 · 0e84acac
  Tuomas Riihimäki committed May 08, 2010
  
  0e84acac Browse Files
- Removed unused imports · ba44e69e
  Tuomas Riihimäki committed May 08, 2010
  
  ba44e69e Browse Files
- Glassfishin_asennus · 0359a29d
  Tuomas Riihimäki committed May 08, 2010
  
  0359a29d Browse Files
- committing changes · f1b25329
  Tuomas Riihimäki committed May 08, 2010
  
  f1b25329 Browse Files
- EventMap & Place kikostusta... EI TOIMI PERKELE · 118a735f
  Tuomas Riihimäki committed May 08, 2010
  
  118a735f Browse Files
- select place via coordinates. · ed4fd0ed
  Tuukka Kivilahti committed May 08, 2010
  
  ed4fd0ed Browse Files
- I can has testdata! \o/ · 87b56a89
  Tuomas Riihimäki committed May 08, 2010
  
  87b56a89