Commits · 62eee628dbd4c98efb2bf4de5d5afa196005add2 · Antti Väyrynen / Moya

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
08 Jan, 2015 1 commit

Merge branch 'restproject' into 'master' · c7abafdc

Rest pojo project

Irrotetaan REST-pojot omaksi projektikseen WEB-projektista jolloin voidaan sisällyttää helposti myös restiä kutsuvaan projektiin (esim DRD)

See merge request !191

committed Jan 08, 2015

c7abafdc Browse Files

07 Jan, 2015 5 commits
- Move placemap rest to restpojo package · e71dfcdd
  Tuomas Riihimäki committed Jan 07, 2015
  
  e71dfcdd Browse Files
- Move reader rest pojos from web to restpojo project · fca5b3e2
  Tuomas Riihimäki committed Jan 07, 2015
  
  fca5b3e2 Browse Files
- Move place rest pojos from web project to restpojo class · 0f4e7cd7
  Tuomas Riihimäki committed Jan 07, 2015
  
  0f4e7cd7 Browse Files
- Move User rest pojos from web project to restpojo-project · ea6e614f
  Tuomas Riihimäki committed Jan 07, 2015
  
  ea6e614f
- Extract rest pojo classes from web project · 044491ba
```
This way pojo classes can be distributed separately to for example android project

 - Initially extract NetworkAssociation pojos and remove one reference to DB project
```
  Tuomas Riihimäki committed Jan 07, 2015
  044491ba
27 Dec, 2014 5 commits
- Merge branch 'master' into 'master' · f9fbb97a
```
Master

nullpointerfixi

See merge request !190
```
  Tuomas Riihimäki committed Dec 27, 2014
  f9fbb97a Browse Files
- asdf · 07dbede4
  Tuukka Kivilahti committed Dec 27, 2014
  
  07dbede4 Browse Files
- Merge branch 'placecodesToFoodwaves' into 'master' · 9aaaffd3
```
Placecodes to foodwaves

paikkakoodi näkyviin ruokatilausten yhteenvetosivulle, kotiinkuljetus nääs.

See merge request !187
```
  Tuomas Riihimäki committed Dec 27, 2014
  9aaaffd3 Browse Files
- Merge branch 'photo_disable_on_kiosk' into 'master' · a2e414ce
```
Photo disable on kiosk

See merge request !188
```
  Tuomas Riihimäki committed Dec 27, 2014
  a2e414ce Browse Files
- Merge branch 'incomingkorjailuja' into 'master' · 6323b15c
```
Incomingkorjailuja

INcoming-korjailuja, tulostetaan kortti ajaxilla, niin sivun reloadi ei aiheuta edellisen toiminnon uudelleentekemistä, joka tässätapauksessa on kortin tulostaminen ^^.

See merge request !189
```
  Tuomas Riihimäki committed Dec 27, 2014
  6323b15c Browse Files
26 Dec, 2014 9 commits
- jotain pientä, ehkä vaiktutaa johonkin, ehkä ei · d597477d
  Tuukka Kivilahti committed Dec 26, 2014
  
  d597477d Browse Files
- option to disable photo on kiosk · bab71ebc
  Tuukka Kivilahti committed Dec 26, 2014
  
  bab71ebc Browse Files
- now placecodes can be found under foodwaves · 6987f98b
  Tuukka Kivilahti committed Dec 26, 2014
  
  6987f98b Browse Files
- Merge branch 'skynettrest' into 'master' · bab82839
```
Skynettrest

There are some specific rest functions that do not need authentication

See merge request !186
```
  Tuukka Kivilahti committed Dec 26, 2014
  bab82839 Browse Files
- Merge branch 'update-mvn' into 'master' · b5bcd4a5
```
Update mvn versions

See merge request !185
```
  Tuukka Kivilahti committed Dec 26, 2014
  b5bcd4a5 Browse Files
- Update maven plugin versions · 816d6501
  Tuomas Riihimäki committed Dec 26, 2014
  
  816d6501 Browse Files
- Allow disabling of rest auth for specific url:s · ba11997f
  Tuomas Riihimäki committed Dec 26, 2014
  
  ba11997f Browse Files
- Merge branch 'update-mvn' into 'master' · 09d7c4c1
```
Update mvn dependencies

See merge request !184
```
  Tuukka Kivilahti committed Dec 26, 2014
  09d7c4c1 Browse Files
- Merge branch 'skynettrest' into 'master' · 18c2fb64
```
Skynettrest

Restore rest api for checking specific role

See merge request !183
```
  Tuukka Kivilahti committed Dec 26, 2014
  18c2fb64 Browse Files
23 Dec, 2014 2 commits
- Restore tag - role checking rest function · 28c01812
  Tuomas Riihimäki committed Dec 23, 2014
  
  28c01812 Browse Files
- Update dependencies and remove duplicate dependency · 18d7b618
  Tuomas Riihimäki committed Dec 23, 2014
  
  18d7b618 Browse Files
22 Dec, 2014 3 commits
- Merge branch 'queueuidfix' into 'master' · 4d85eae6
```
Queue uid fix

Wrong id got passed..

See merge request !182
```
  Tuukka Kivilahti committed Dec 22, 2014
  4d85eae6 Browse Files
- Merge branch 'codestyle' into 'master' · 69c4aead
```
Codestyle

Formatting only. Found via Sonarcube.

See merge request !181
```
  Tuukka Kivilahti committed Dec 22, 2014
  69c4aead Browse Files
- Merge branch 'billist' into 'master' · 707c1741
```
Bill list fix

Fix users bill list

See merge request !180
```
  Tuukka Kivilahti committed Dec 22, 2014
  707c1741 Browse Files
20 Dec, 2014 2 commits
- Fix user link in queue · da289c0c
```
Conflicts:
	code/moya-web/WebContent/neomap/quemgmt.xhtml
```
  Tuomas Riihimäki committed Dec 20, 2014
  da289c0c Browse Files
- Formatting and code style · 25dcabce
```
No functional changes. Only formatting. Found with sonarcube
```
  Tuomas Riihimäki committed Dec 20, 2014
  25dcabce Browse Files
17 Dec, 2014 7 commits
- Fix my bills · a1396449
  Tuomas Riihimäki committed Dec 17, 2014
  
  a1396449
- Merge branch 'releaseplace' into 'master' · 5437c64b
```
minor updates

Check commit messages

See merge request !179
```
  Tuukka Kivilahti committed Dec 17, 2014
  5437c64b Browse Files
- Fix paytrail payment checking · 7cd6dac8
  Tuomas Riihimäki committed Dec 17, 2014
  
  7cd6dac8 Browse Files
- irc bot restarting · 58fb249b
  Tuomas Riihimäki committed Dec 17, 2014
  
  58fb249b Browse Files
- i18n for previous commit · a83af5a4
  Tuomas Riihimäki committed Dec 17, 2014
  
  a83af5a4 Browse Files
- Add link to quemgmt and fix queue size · 1b9cdcc5
  Tuomas Riihimäki committed Dec 17, 2014
  
  1b9cdcc5 Browse Files
- Lock and release placeslots · 979346f1
  Tuomas Riihimäki committed Dec 17, 2014
  
  979346f1 Browse Files
16 Dec, 2014 5 commits
- Add bill id to billist · 54d109ae
  Tuomas Riihimäki committed Dec 16, 2014
  
  54d109ae Browse Files
- Merge branch 'releaseplace' into 'master' · 39f25ee8
```
Updates

Look at the commits

See merge request !178
```
  Tuukka Kivilahti committed Dec 16, 2014
  39f25ee8 Browse Files
- Bill ID to list · b4ee141e
  Tuomas Riihimäki committed Dec 16, 2014
  
  b4ee141e Browse Files
- IRC server password · 2fbbded3
  Tuomas Riihimäki committed Dec 16, 2014
  
  2fbbded3 Browse Files
- i18n · 2b1d625b
  Tuomas Riihimäki committed Dec 16, 2014
  
  2b1d625b Browse Files