Commits · c8104aa8d4324ee1a046419ebdec95459ebdbb9c · Linnea Samila / Moya

14 Dec, 2014 14 commits
- Merge branch 'help' into 'master' · c8104aa8
```
Queue fix 2, helpfix

See merge request !170
```
  Tuukka Kivilahti committed Dec 14, 2014
  c8104aa8 Browse Files
- FIx queue · 7f6a0326
  Tuomas Riihimäki committed Dec 14, 2014
  
  7f6a0326 Browse Files
- Menupage · a043f778
  Tuomas Riihimäki committed Dec 14, 2014
  
  a043f778 Browse Files
- Merge branch 'help' into 'master' · c279d1fb
```
Fix queueue

See merge request !169
```
  Tuukka Kivilahti committed Dec 14, 2014
  c279d1fb Browse Files
- Hurr · 514a2776
  Tuomas Riihimäki committed Dec 14, 2014
  
  514a2776 Browse Files
- Merge branch 'help' into 'master' · cfdf16c6
```
Queueueueu

See merge request !168
```
  Tuukka Kivilahti committed Dec 14, 2014
  cfdf16c6 Browse Files
- Queueueue · 9a45c807
  Tuomas Riihimäki committed Dec 14, 2014
  
  9a45c807 Browse Files
- Merge branch 'assymuutoksia_loppufixei' into 'master' · b64ba3b7
```
Assymuutoksia loppufixei

See merge request !167
```
  Tuomas Riihimäki committed Dec 14, 2014
  b64ba3b7 Browse Files
- Merge branch 'help' into 'master' · 248dc1a2
```
Helppisivu

See merge request !166
```
  Tuukka Kivilahti committed Dec 14, 2014
  248dc1a2 Browse Files
- asdf · e984bdf2
  Tuukka Kivilahti committed Dec 14, 2014
  
  e984bdf2
- Help menu view (quick and dirty) · 72327b43
  Tuomas Riihimäki committed Dec 14, 2014
  
  72327b43 Browse Files
- Merge branch 'master' into 'master' · 48917962
```
Master

autoproduct for user

See merge request !165
```
  Tuomas Riihimäki committed Dec 14, 2014
  48917962 Browse Files
- autoproduct for bill · 865f949a
  Tuukka Kivilahti committed Dec 14, 2014
  
  865f949a Browse Files
- autoproduct for bill · 53977e2a
  Tuukka Kivilahti committed Dec 14, 2014
  
  53977e2a Browse Files
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 Browse Files
- 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 16 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 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
- 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
- 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