Commits · 782938d5e424d817ab7ee750f8b8d8c3e4e48edf · Linnea Samila / Moya

23 Dec, 2015 8 commits
- Merge branch 'legend-conponent' into 'master' · 782938d5
```
Legend component

See merge request !316
```
  Tuukka Kivilahti committed Dec 23, 2015
  782938d5 Browse Files
- Add missing legend-component · 76a3bda3
  Tuomas Riihimäki committed Dec 23, 2015
  
  76a3bda3 Browse Files
- Merge branch 'Menustuff' into 'master' · e6da98a1
```
Menu state fix

Minor fix for annoying menu state bug.

See merge request !319
```
  Tuukka Kivilahti committed Dec 23, 2015
  e6da98a1 Browse Files
- Merge branch 'mapque' into 'master' · c8ffa521
```
Minor mapqueue fix

MapQUueue is fully thread safe, don't bother container for thread management.
Also. We don't want to use synchronized..

See merge request !318
```
  Tuukka Kivilahti committed Dec 23, 2015
  c8ffa521 Browse Files
- Merge branch 'lockedQueue' into 'master' · 3fc2964a
```
Queue handling

If user had selected all places, but had not locked the places, user would be unable to enter the queue again.

See merge request !313
```
  Tuukka Kivilahti committed Dec 23, 2015
  3fc2964a Browse Files
- Merge branch 'cardtemplatefix' into 'master' · 09875ba8
```
Card template fix

Do not use role reference from card templates

See merge request !309
```
  Tuukka Kivilahti committed Dec 23, 2015
  09875ba8 Browse Files
- Menus states should be hold per page, not per site. · 150b66f1
  Tuomas Riihimäki committed Dec 23, 2015
  
  150b66f1 Browse Files
- Remove synchronized from mapQueue · 5ea99194
  Tuomas Riihimäki committed Dec 23, 2015
  
  5ea99194
21 Dec, 2015 7 commits
- Merge branch 'newtemplate' into 'master' · 0e84e27d
```
Usersearch ui updates

 Käyttäjähaun tarkennetun haun ja käyttäjäkorin ui-komponentteja muotoiltu

See merge request !317
```
  Tuomas Riihimäki committed Dec 21, 2015
  0e84e27d Browse Files
- Käyttäjähaun tarkennetun haun ja käyttäjäkorin ui-komponentteja muotoiltu, niihi… · 9cbd2ae3
```
…n liittyen pari uutta käännöstä.
```
  Sanna Paaso committed Dec 21, 2015
  9cbd2ae3 Browse Files
- Entering queue with all reserved but unlocked slots · 63e26a5f
  Tuomas Riihimäki committed Dec 21, 2015
  
  63e26a5f Browse Files
- Extract legend as component · c5923601
  Tuomas Riihimäki committed Dec 21, 2015
  
  c5923601 Browse Files
- Merge branch 'seatpmap' into 'master' · 4c2e05a7
```
Seatmap stuff

Random seatmap stuff.

See merge request !314
```
  Antti Jaakkola committed Dec 21, 2015
  4c2e05a7 Browse Files
- Merge branch 'newtemplate' into 'master' · 44509956
```
Newtemplate

Muokattu oikean ylänurkan moya-logon linkki aukeamaan uuteen ikkunaan ja lisättyä paddingia siirtämään logo pois reunoista

See merge request !315
```
  Tuomas Riihimäki committed Dec 21, 2015
  44509956 Browse Files
- Muokattu oikean ylänurkan moya-logo aukeamaan uuteen ikkunaan ja lisätty vähän p… · cf503b46
```
…addingia siirtämään se pois reunasta.
```
  Sanna Paaso committed Dec 21, 2015
  cf503b46 Browse Files
20 Dec, 2015 13 commits
- Refactor seatmap to allow set arbitrary onclick callback · 30369d58
  Tuomas Riihimäki committed Dec 20, 2015
  
  30369d58
- Add casablanca as template · 902426c4
  Tuomas Riihimäki committed Dec 20, 2015
  
  902426c4 Browse Files
- Merge branch 'productrest' into 'master' · 6e74cbc3
```
Product rest

Fetch all products over rest

See merge request !312
```
  Antti Jaakkola committed Dec 20, 2015
  6e74cbc3 Browse Files
- Whoops · c7024c7e
  Tuomas Riihimäki committed Dec 20, 2015
  
  c7024c7e Browse Files
- Product rest functions · c98a3433
  Tuomas Riihimäki committed Dec 20, 2015
  
  c98a3433 Browse Files
- Merge branch 'i18n' into 'master' · 89cff9f2
```
Pikkufiksi lokalisointiin

See merge request !311
```
  Tuomas Riihimäki committed Dec 20, 2015
  89cff9f2 Browse Files
- sanna nipottaa.. :) · f17b091c
  Tuomas Riihimäki committed Dec 20, 2015
  
  f17b091c Browse Files
- Merge branch 'i18nfix' into 'master' · 3fa7af61
```
I18nfix

Recommit stuff lost in i18n conflict resolution...

See merge request !310
```
  Tuomas Riihimäki committed Dec 20, 2015
  3fa7af61 Browse Files
- Fix i18n stuff lost in mergeconflict · 8fe675c2
  Tuomas Riihimäki committed Dec 20, 2015
  
  8fe675c2 Browse Files
- Merge branch 'lokalisointia' into 'master' · 24d1b3c7
```
Lokalisointia

Termien käännösten korjailua

See merge request !308
```
  Tuomas Riihimäki committed Dec 20, 2015
  24d1b3c7 Browse Files
- Termien käännöksiä tarkastettu ja korjattu · b655de64
```
Muutama käyttämätön käännös poistettu
```
  Sanna Paaso committed Dec 20, 2015
  b655de64 Browse Files
- role reference from cardtemplate was removed, but it was still used in few pages. · 1f54747e
  Tuomas Riihimäki committed Dec 20, 2015
  
  1f54747e Browse Files
- Merge branch 'infoview_template_timeout' into 'master' · b698f8ed
```
Infoview template timeout

added timeout thingy to infoview's template

See merge request !307
```
  Tuomas Riihimäki committed Dec 20, 2015
  b698f8ed Browse Files
19 Dec, 2015 7 commits
- see bracnhname · 88d88eb2
  Tuukka Kivilahti committed Dec 19, 2015
  
  88d88eb2 Browse Files
- Merge branch 'better_keeplalive_timeout' into 'master' · 8efba7f2
```
Better keeplalive timeout

See merge request !306
```
  Tuomas Riihimäki committed Dec 19, 2015
  8efba7f2 Browse Files
- Merge branch 'cleanup' into 'master' · ae9dbe56
```
Code cleanup

Minor code cleanups. No functional changes.

See merge request !305
```
  Tuukka Kivilahti committed Dec 19, 2015
  ae9dbe56 Browse Files
- Merge branch 'buyfix' into 'master' · 82ed9dd3
```
Autoproduct can not be bought as the only product

System would allow users to buy delivery costs as the only product.
We don't want this.

See merge request !304
```
  Tuukka Kivilahti committed Dec 19, 2015
  82ed9dd3 Browse Files
- Alert -> modal popup · c1a2051c
  Tuukka Kivilahti committed Dec 19, 2015
  
  c1a2051c Browse Files
- Automatically added product can not be only product bought. · 4060b94d
  Tuomas Riihimäki committed Dec 19, 2015
  
  4060b94d
- Cleanup code · 7cbb7289
  Tuomas Riihimäki committed Dec 19, 2015
  
  7cbb7289 Browse Files
18 Dec, 2015 3 commits

Merge branch 'randomFixes' into 'master' · 705f45f5
```
Random fixes and code cleanup

See merge request !302
```
Juho Juopperi committed Dec 18, 2015
705f45f5 Browse Files
Whoops. · ab400bf1
Tuomas Riihimäki committed Dec 18, 2015

ab400bf1 Browse Files

Update product cart counts when committing cart. · 68deeb02

It is possible to reserve any number of products despite product limits
if you type the number of products you want to buy and press 'buy'-button.

This is caused by event listener for product line firing after submit button is launched
This seems to be also fixed in newer primefaces version, but we don't want to trust
anything sent by javascript

committed Dec 18, 2015

68deeb02 Browse Files

14 Dec, 2015 1 commit
- Random fixes and code cleanup · bda09b74
  Tuomas Riihimäki committed Dec 14, 2015
  
  bda09b74
12 Aug, 2015 1 commit
- Merge branch 'ticketPermissionCheck' into 'master' · 3139ac65
```
Ticket permission check

permissiochecki elippuun.

See merge request !298
```
  Tuomas Riihimäki committed Aug 12, 2015
  3139ac65 Browse Files