Commits · c98a99afb8dfcf6cd6a3c44272429c4bdff4bafb · Codecrew / Moya

15 Dec, 2014 14 commits
- Add slot id to admingroups list · c98a99af
  Tuomas Riihimäki committed Dec 15, 2014
  
  c98a99af Browse Files
- Do not count 'buyable=false' as selectable · 91942836
  Tuomas Riihimäki committed Dec 15, 2014
  
  91942836 Browse Files
- Show login instead of nick in queuemgmt · f16445b7
  Tuomas Riihimäki committed Dec 15, 2014
  
  f16445b7 Browse Files
- Show only slots from paid bills · 493a5124
  Tuomas Riihimäki committed Dec 15, 2014
  
  493a5124 Browse Files
- Merge branch 'queue' into 'master' · f607b9ae
```
Queue management

See merge request !177
```
  Tuukka Kivilahti committed Dec 15, 2014
  f607b9ae Browse Files
- Queue management view · c553b55d
  Tuomas Riihimäki committed Dec 15, 2014
  
  c553b55d
- Merge branch 'help' into 'master' · 74e48fdb
```
Conversation keepalive

Keep conversation alive ( create ajax query every 20 seconds)
Minor template fixing

See merge request !176
```
  Tuukka Kivilahti committed Dec 15, 2014
  74e48fdb Browse Files
- Conversation keepalive · f256b97d
  Tuomas Riihimäki committed Dec 15, 2014
  
  f256b97d Browse Files
- Layout stuff · b7a8a404
  Tuomas Riihimäki committed Dec 15, 2014
  
  b7a8a404 Browse Files
- Accounteventcreation logging · 42decab2
  Tuomas Riihimäki committed Dec 15, 2014
  
  42decab2 Browse Files
- Barcode generation maven stuff · f50a95be
  Tuomas Riihimäki committed Dec 15, 2014
  
  f50a95be Browse Files
- Merge branch 'reserve_ui' into 'master' · 8fdb8ed2
```
Ilmoitus kun lähtee poies sivulta

Ilimoitus kun lähtee pois varaussivulta, nyt enemmän selainystävällisenä.

(vanha tyyli toimi joissain selaimissa, mut nykyspeksin mukaan ei voida näyttää alerttia beforeunload -eventissä, vaan voidaan pelkästään palauttaa viesti, joka sitten näytetään käyttäjälle selaimen puolesta).

See merge request !175
```
  Tuomas Riihimäki committed Dec 15, 2014
  8fdb8ed2 Browse Files
- ilmoitus kun lähtee kuikkaan · aeb5d833
  Tuukka Kivilahti committed Dec 15, 2014
  
  aeb5d833
- reformat · 54a1900d
  Tuukka Kivilahti committed Dec 15, 2014
  
  54a1900d Browse Files
14 Dec, 2014 22 commits
- Merge branch 'help' into 'master' · dbd353de
```
Queue mgmt

See merge request !174
```
  Tuukka Kivilahti committed Dec 14, 2014
  dbd353de Browse Files
- Queue mgmt · 89e58f87
  Tuomas Riihimäki committed Dec 14, 2014
  
  89e58f87 Browse Files
- Merge branch 'help' into 'master' · 1bc15f4e
```
paytrail price fix

See merge request !173
```
  Tuukka Kivilahti committed Dec 14, 2014
  1bc15f4e Browse Files
- Fix paytrail > 1000 and decimal rounding bugs · 831114ff
  Tuomas Riihimäki committed Dec 14, 2014
  
  831114ff Browse Files
- Merge branch 'paikkamaarafix' into 'master' · 8de04dbd
```
Paikkamaarafix

See merge request !172
```
  Tuomas Riihimäki committed Dec 14, 2014
  8de04dbd Browse Files
- Merge branch 'assymuutoksia_loppufixei' into 'master' · 8970364e
```
Assymuutoksia loppufixei

värit

See merge request !171
```
  Tuomas Riihimäki committed Dec 14, 2014
  8970364e Browse Files
- asdf · ed3be01b
  Tuukka Kivilahti committed Dec 14, 2014
  
  ed3be01b Browse Files
- värit · 9ed040d2
  Tuukka Kivilahti committed Dec 14, 2014
  
  9ed040d2 Browse Files
- 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
- 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
- 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 4 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