Commits · 602bcc354b199d5e1a762b479bebdfefb52faf47 · Riina Antikainen / Moya

12 Dec, 2014 11 commits
- Ajax stuff for queue management · 602bcc35
  Tuomas Riihimäki committed Dec 12, 2014
  
  602bcc35 Browse Files
- Merge branch 'moarmoaretikettia' into 'master' · 17e0fb65
```
Moarmoaretikettia

Toivon että tässä on ny uusimmat, vähän spurdospardocommittia :P

See merge request !157
```
  Tuomas Riihimäki committed Dec 12, 2014
  17e0fb65 Browse Files
- stuff · 5e903338
  Tuukka Kivilahti committed Dec 12, 2014
  
  5e903338 Browse Files
- asdf · 0d52c6aa
  Tuukka Kivilahti committed Dec 12, 2014
  
  0d52c6aa Browse Files
- prelento-commit · d0650781
  Tuukka Kivilahti committed Dec 12, 2014
  
  d0650781 Browse Files
- prelento-commit · f5adb03b
  Tuukka Kivilahti committed Dec 12, 2014
  
  f5adb03b Browse Files
- prelento-commit · a186862d
  Tuukka Kivilahti committed Dec 12, 2014
  
  a186862d Browse Files
- prelento-commit · 63b4790a
  Tuukka Kivilahti committed Dec 12, 2014
  
  63b4790a Browse Files
- prelento-commit · 4e395300
  Tuukka Kivilahti committed Dec 12, 2014
  
  4e395300 Browse Files
- prelento-commit · 010b7f84
  Tuukka Kivilahti committed Dec 12, 2014
  
  010b7f84 Browse Files
- Merge branch 'ui_fixes' into 'master' · e4140e2a
```
Ui fixes

Muista vetää maven update ennen tän iskemistä tuotantoon, niin saadaan ehjät 2d viivakoodit

See merge request !156
```
  Tuomas Riihimäki committed Dec 12, 2014
  e4140e2a Browse Files
11 Dec, 2014 4 commits
- 0 is gutt · bb006657
  Tuukka Kivilahti committed Dec 11, 2014
  
  bb006657 Browse Files
- moar list · f610d240
  Tuukka Kivilahti committed Dec 11, 2014
  
  f610d240 Browse Files
- billlines to billList · 49d32ef9
  Tuukka Kivilahti committed Dec 11, 2014
  
  49d32ef9 Browse Files
- ui changes · b8dbe57b
  Tuukka Kivilahti committed Dec 11, 2014
  
  b8dbe57b
10 Dec, 2014 20 commits
- Merge remote-tracking branch 'tkfftk/master' into ui_fixes · 2fbb269d
```
Conflicts:
	code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
	code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
	code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
```
  Tuukka Kivilahti committed Dec 10, 2014
  2fbb269d Browse Files
- Merge remote-tracking branch 'origin/master' · d5834201
  Tuukka Kivilahti committed Dec 10, 2014
  
  d5834201 Browse Files
- Merge branch 'queuefixes' into 'master' · b8430ab6
```
Queuefixes

asdf

See merge request !155
```
  Tuomas Riihimäki committed Dec 10, 2014
  b8430ab6 Browse Files
- Merge remote-tracking branch 'origin/master' into queuefixes · ef6aada0
  Tuukka Kivilahti committed Dec 10, 2014
  
  ef6aada0 Browse Files
- Merge remote-tracking branch 'tuomari/queue' into queuefixes · 592edfba
  Tuukka Kivilahti committed Dec 10, 2014
  
  592edfba Browse Files
- Merge branch 'queue' into 'master' · fb37e3fb
```
Queue

Queue ugly, but working version

See merge request !154
```
  Tuukka Kivilahti committed Dec 10, 2014
  fb37e3fb Browse Files
- Add checking for selecting places · 99309154
  Tuomas Riihimäki committed Dec 10, 2014
  
  99309154 Browse Files
- queue stuff · fa617d3b
  Tuukka Kivilahti committed Dec 10, 2014
  
  fa617d3b Browse Files
- Quefixes · e0c3d5bf
  Tuomas Riihimäki committed Dec 10, 2014
  
  e0c3d5bf Browse Files
- Moar map · da9d3e91
  Tuomas Riihimäki committed Dec 10, 2014
  
  da9d3e91 Browse Files
- Merge remote-tracking branch 'origin/master' · cd6976d6
  Tuukka Kivilahti committed Dec 10, 2014
  
  cd6976d6 Browse Files
- Moar queue · 4966dc18
  Tuomas Riihimäki committed Dec 10, 2014
  
  4966dc18 Browse Files
- Add method for fetching the position of user in the queue. · 2c6396cb
  Tuomas Riihimäki committed Dec 10, 2014
  
  2c6396cb Browse Files
- Actually put entries in to the queue · 34646e33
  Tuomas Riihimäki committed Dec 10, 2014
  
  34646e33 Browse Files
- Initial QueueBean implementation · 4d268fed
  Tuomas Riihimäki committed Dec 10, 2014
  
  4d268fed Browse Files
- Queue raw · cb32afc5
  Tuomas Riihimäki committed Dec 10, 2014
  
  cb32afc5 Browse Files
- Merge branch 'eticket' into 'master' · 860a76c0
```
Eticket

Etiket-systeemi demokunnossa, ei vielä mobiilisivua.

See merge request !153
```
  Tuomas Riihimäki committed Dec 10, 2014
  860a76c0 Browse Files
- minor changes · eadce3f4
  Tuukka Kivilahti committed Dec 10, 2014
  
  eadce3f4 Browse Files
- eticket stuff · 23ab20ec
  Tuukka Kivilahti committed Dec 10, 2014
  
  23ab20ec Browse Files
- Merge branch 'place_slot_remove_fix' into 'master' · 0eda61d3
```
Place slot remove fix

Muokataan placeslotista paikka tyhjäksi silloin kun siihen sidottu paikka vapautetaan. PlaceSlot jää kuitenkin "käytetyksi" -> näille vois tehdä joskus muokkaimen tai jotain.

See merge request !152
```
  Tuomas Riihimäki committed Dec 10, 2014
  0eda61d3 Browse Files
09 Dec, 2014 5 commits
- Merge remote-tracking branch 'origin/master' into eticket · 25802090
  Tuukka Kivilahti committed Dec 09, 2014
  
  25802090 Browse Files
- Merge remote-tracking branch 'origin/master' · 895bd5f7
  Tuukka Kivilahti committed Dec 09, 2014
  
  895bd5f7 Browse Files
- just to be sure · fd6cc3e5
  Tuukka Kivilahti committed Dec 09, 2014
  
  fd6cc3e5 Browse Files
- Merge branch 'localefix' into 'master' · cc731e52
```
Localefix

fixes default locale to fi

Mergeä eka edellinen ,mul näköjään on se tässä pohjana.

See merge request !150
```
  Tuomas Riihimäki committed Dec 09, 2014
  cc731e52 Browse Files
- Merge remote-tracking branch 'origin/master' into localefix · 6215ba43
  Tuukka Kivilahti committed Dec 09, 2014
  
  6215ba43 Browse Files