Commits · a392afcb748f48a4a22783e84c366d68669bc5ac · Codecrew / Moya

13 Dec, 2014 10 commits
- Merge branch 'queue' into 'master' · a392afcb
```
Placeslot viewing

Add placeslots as list to admin view of users places

See merge request !164
```
  Tuukka Kivilahti committed Dec 13, 2014
  a392afcb Browse Files
- Add placeslotlist ot users placegroups · 4ef5e555
  Tuomas Riihimäki committed Dec 13, 2014
  
  4ef5e555 Browse Files
- Add ability to fetch all users slots · b29b2bde
  Tuomas Riihimäki committed Dec 13, 2014
  
  b29b2bde
- Merge branch 'minor-ui' into 'master' · 0adebf2f
```
Minor ui

Show login instead of nick in login

See merge request !163
```
  Tuukka Kivilahti committed Dec 13, 2014
  0adebf2f Browse Files
- Merge branch 'botmsg' into 'master' · 306df88c
```
Update irc bot message format

See merge request !162
```
  Tuukka Kivilahti committed Dec 13, 2014
  306df88c Browse Files
- Merge branch 'oldLanFix' into 'master' · 9faddab0
```
Old lan fix

korjaa astral-lanien bugin, toivottavasti

See merge request !161
```
  Tuomas Riihimäki committed Dec 13, 2014
  9faddab0 Browse Files
- Update irc bot message format · f3c4c041
  Tuomas Riihimäki committed Dec 13, 2014
  
  f3c4c041
- Merge branch 'slotautorelease' into 'master' · 1a36f487
```
Slot autorelease

When place is timeouted ( user has not locked a place ), also release slot associated to the place

See merge request !160
```
  Tuukka Kivilahti committed Dec 13, 2014
  1a36f487 Browse Files
- fix for astral-lan · b24f70d2
  Tuukka Kivilahti committed Dec 13, 2014
  
  b24f70d2 Browse Files
- Automatically release slot when place is released by timeout · 923d4f4f
  Tuomas Riihimäki committed Dec 13, 2014
  
  923d4f4f Browse Files
12 Dec, 2014 17 commits
- Merge branch 'moarmoaretikettia' into 'master' · a680baac
```
Moarmoaretikettia

See merge request !159
```
  Tuomas Riihimäki committed Dec 12, 2014
  a680baac Browse Files
- blob · 43c0b754
  Tuukka Kivilahti committed Dec 12, 2014
  
  43c0b754 Browse Files
- Merge branch 'que2' into 'master' · 2f24b40c
```
Map queue

Fairly finalized version of the placequeue

See merge request !158
```
  Tuukka Kivilahti committed Dec 12, 2014
  2f24b40c Browse Files
- Placemap queue · ba2bf449
  Tuomas Riihimäki committed Dec 12, 2014
  
  ba2bf449
- Ajax map user fetching · c0ba0ad1
  Tuomas Riihimäki committed Dec 12, 2014
  
  c0ba0ad1 Browse Files
- Ajax stuff for queue management · 602bcc35
  Tuomas Riihimäki committed Dec 12, 2014
  
  602bcc35
- 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
- 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
- prelento-commit · 010b7f84
  Tuukka Kivilahti committed Dec 12, 2014
  
  010b7f84
- Change 'nick' to 'login' on menu · 859d5f6a
  Tuomas Riihimäki committed Dec 12, 2014
  
  859d5f6a 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 9 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