Commits · 6eb96c40452045ce76ca406fb757c9e95c7d17e3 · Codecrew / Moya

11 Jan, 2015 1 commit

Remove product refrerence from GroupMembership · 6eb96c40

This was added in anticipation of place reservation rework.
This was not actually used, but PlaceSlot was created instead

committed Jan 11, 2015

6eb96c40 Browse Files

10 Jan, 2015 38 commits
- Merge branch 'blob' into 'master' · 2e166ee9
```
Blob

fix

See merge request !206
```
  Tuukka Kivilahti committed Jan 10, 2015
  2e166ee9 Browse Files
- asdf · 3734da44
  Tuukka Kivilahti committed Jan 10, 2015
  
  3734da44
- Merge branch 'userreservation' into 'master' · f862b157
```
Userreservation

....

See merge request !205
```
  Tuukka Kivilahti committed Jan 10, 2015
  f862b157 Browse Files
- Bugfix · 862c0c49
  Tuomas Riihimäki committed Jan 10, 2015
  
  862c0c49 Browse Files
- Merge branch 'cardgiver' into 'master' · 7df098f7
```
Cardgiver

Add field to groupmembership

See merge request !203
```
  Tuukka Kivilahti committed Jan 10, 2015
  7df098f7 Browse Files
- Merge branch 'userreservation' into 'master' · ceabdea2
```
Userreservation

User reservation rest for fetching user reservations (DRD)

See merge request !202
```
  Tuukka Kivilahti committed Jan 10, 2015
  ceabdea2 Browse Files
- Merge branch 'master' into 'master' · 7bad8abc
```
Master

See merge request !204
```
  Tuukka Kivilahti committed Jan 10, 2015
  7bad8abc Browse Files
- cat · 39d5a263
  Tuukka Kivilahti committed Jan 10, 2015
  
  39d5a263 Browse Files
- Rest documentation · a3f1d8dc
  Tuomas Riihimäki committed Jan 10, 2015
  
  a3f1d8dc Browse Files
- Add /user/{userid}/reservations rest api · 19e1d46e
  Tuomas Riihimäki committed Jan 10, 2015
  
  19e1d46e Browse Files
- Added UserReservation pojos and bumped project version · 7bfb72c8
  Tuomas Riihimäki committed Jan 10, 2015
  
  7bfb72c8 Browse Files
- Add 'enteredEventAdmin' to GroupMembership · 00b9aeba
  Tuomas Riihimäki committed Jan 10, 2015
  
  00b9aeba Browse Files
- Merge branch 'versionfix' into 'master' · eed117f3
```
Versionfix

...

See merge request !199
```
  Juho Juopperi committed Jan 10, 2015
  eed117f3 Browse Files
- Merge branch 'tkfftkFailasTaas' into 'master' · f5ebb8fd
```
Tkfftk failas taas

ja tää filu kans

See merge request !200
```
  Tuomas Riihimäki committed Jan 10, 2015
  f5ebb8fd Browse Files
- asdf · 85ac31bd
  Tuukka Kivilahti committed Jan 10, 2015
  
  85ac31bd
- java 1.5 does not include @XmlElement · 62191843
  Tuomas Riihimäki committed Jan 10, 2015
  
  62191843 Browse Files
- Merge branch 'feature/logging-context' into 'master' · 3ba07d8a
```
Feature/logging context

See merge request !198
```
  Tuomas Riihimäki committed Jan 10, 2015
  3ba07d8a Browse Files
- Merge branch 'master' into 'master' · 40f5dc75
```
Master

Fixed filename on a PNG file removing scandinavig o letter.

See merge request !196
```
  Juho Juopperi committed Jan 10, 2015
  40f5dc75 Browse Files
- Merge branch 'cardlessIncomingView' into 'master' · 49771f89
```
Cardless incoming view

cardless incomingview for lantrek and assembly

See merge request !197
```
  Juho Juopperi committed Jan 10, 2015
  49771f89 Browse Files
- Merge branch 'restauth' into 'master' · 662f4348
```
Random minor fixes and additions for android app

Check commit messages.

See merge request !195
```
  Juho Juopperi committed Jan 10, 2015
  662f4348 Browse Files
- Populate MDC logging context variables directly in HostnameFilter so no separate… · 20e3d60c
```
… MDCInsertingServletFilter is necessary. Also remove unused filters.
```
  Juho Juopperi committed Jan 10, 2015
  20e3d60c Browse Files
- Merge remote-tracking branch 'origin/master' into cardlessIncomingView · 729afc0a
  Tuukka Kivilahti committed Jan 10, 2015
  
  729afc0a Browse Files
- ja menua pukkaa · 32711783
  Tuukka Kivilahti committed Jan 10, 2015
  
  32711783 Browse Files
- Fixed .png file name · 17895ee3
  Ossi Pesonen committed Jan 10, 2015
  
  17895ee3 Browse Files
- Merge branch 'master' into 'master' · 0192b041
```
Master

Created a new template called moyav2. A new theme.

See merge request !194
```
  Tuomas Riihimäki committed Jan 10, 2015
  0192b041 Browse Files
- Merge branch 'turnausmenufix' into 'master' · 3b7f0a6f
```
Turnausmenufix

omat ilmoittautumiset poies anomuumilta.

See merge request !192
```
  Tuomas Riihimäki committed Jan 10, 2015
  3b7f0a6f Browse Files
- Add authentication function and filters for eventuserlist · ccd37ebf
```
Yes, yes. I know.. Authentication with session is not strictly REST.
```
  Tuomas Riihimäki committed Jan 10, 2015
  ccd37ebf Browse Files
- Remove java 1.7 style list init to allow for 1.6 compile level · 2bef5751
  Tuomas Riihimäki committed Jan 10, 2015
  
  2bef5751 Browse Files
- Remove only logger reference in restpojo · 620685f7
  Tuomas Riihimäki committed Jan 10, 2015
  
  620685f7 Browse Files
- Add maven distrubution stuff to restpojo · 8b7d433d
  Tuomas Riihimäki committed Jan 10, 2015
  
  8b7d433d Browse Files
- Do not explode if principal is null · 81b6c93a
  Tuomas Riihimäki committed Jan 10, 2015
  
  81b6c93a Browse Files
- Add function to permbean 'isCurrentUser' with 'login' · 9a98b30e
  Tuomas Riihimäki committed Jan 10, 2015
  
  9a98b30e Browse Files
- Merge remote-tracking branch 'origin/master' into cardlessIncomingView · 3e3b3e9a
  Tuukka Kivilahti committed Jan 10, 2015
  
  3e3b3e9a Browse Files
- first working version, menus still missing · 4eb74de6
  Tuukka Kivilahti committed Jan 10, 2015
  
  4eb74de6 Browse Files
- Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya · 2b9d7703
  Ossi Pesonen committed Jan 10, 2015
  
  2b9d7703 Browse Files
- Merge branch 'feature/exploded-ear' into 'master' · 3521c558
```
Feature/exploded ear

Add maven profile, that when enabled in IntelliJ IDEA, allows using the ear:exploded artifact to get hot deploy on glassfish.

See merge request !193
```
  Tuukka Kivilahti committed Jan 10, 2015
  3521c558 Browse Files
- Added v2 template · 5225b308
  Ossi Pesonen committed Jan 10, 2015
  
  5225b308 Browse Files
- profile for idea hot deploy compatible exploded ear · cd967aab
  Juho Juopperi committed Jan 10, 2015
  
  cd967aab
09 Jan, 2015 1 commit
- vanhalla menulla anomuumi näkee "omat turnausilmoittautumiset",\ntämä ei ehkä hy… · 62eee628
```
…vä. Tän pitäis fixata se
```
  Tuukka Kivilahti committed Jan 09, 2015
  62eee628 Browse Files