Commits · e48ea42723fff93d045592a8fbe96f9fdb3314c8 · Antti Väyrynen / Moya

01 Mar, 2014 11 commits
- Merge branch 'master' into 'master' · e48ea427
```
lukitun paikan voi ny varata, jos on admin

Paikan varaaminen vapauttaa paikan, jos sen tekee adminina.

fixes #21

Reviewed-by: @tuomari
```
  Tuomas Riihimäki committed Mar 01, 2014
  e48ea427 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya · b48c82c4
  Tuukka Kivilahti committed Mar 01, 2014
  
  b48c82c4 Browse Files
- fixes #29 and fixes #11 , menukorjailuja · 5788d745
  Tuukka Kivilahti committed Mar 01, 2014
  
  5788d745 Browse Files
- and also adminreserve -bug · 23de08af
  Tuukka Kivilahti committed Mar 01, 2014
  
  23de08af Browse Files
- fixes #21 , Admin voi varata nyt lukitun paikan · 980ef3d9
  Tuukka Kivilahti committed Mar 01, 2014
  
  980ef3d9 Browse Files
- Merge branch 'master' into 'master' · d51cb4ad
```
rekisteriseloste

korjaa tiketin #20
```
  Tuomas Riihimäki committed Mar 01, 2014
  d51cb4ad Browse Files
- Merge branch 'restfix' into 'master' · c0b39519
```
Restfix

Puuttui yksi funktio, eikä projekti käänny sen takia..
```
  Tuukka Kivilahti committed Mar 01, 2014
  c0b39519 Browse Files
- Lisätään vielä permissiot · 60ffa2cb
  Tuomas Riihimäki committed Mar 01, 2014
  
  60ffa2cb Browse Files
- Hupsista.. Puuttui funktio EventMapBeanista · 4c248eae
  Tuomas Riihimäki committed Mar 01, 2014
  
  4c248eae Browse Files
- fixes #20 · 49e5e369
  Tuukka Kivilahti committed Mar 01, 2014
  
  49e5e369 Browse Files
- Merge branch 'restapistuff' into 'master' · 843aed1b
```
Paikkajuttuihin rest

closes #30
closes #35

HUOMHUOM! Tässä ei ole vielä (juuri) mitään authia!
```
  Tuukka Kivilahti committed Mar 01, 2014
  843aed1b Browse Files
28 Feb, 2014 13 commits
- Merge remote-tracking branch 'origin/master' into restapistuff · 55187fa6
  Tuomas Riihimäki committed Feb 28, 2014
  
  55187fa6 Browse Files
- Added place management rest stuff · 6ac4daa7
  Tuomas Riihimäki committed Feb 28, 2014
  
  6ac4daa7
- Merge branch 'master' into 'master' · 00a42dce
```
sisältöeditori, korjauksia

closes #9
```
  Tuomas Riihimäki committed Feb 28, 2014
  00a42dce Browse Files
- fixes #9 · 5171781f
  Tuukka Kivilahti committed Feb 28, 2014
  
  5171781f Browse Files
- Merge branch 'master' into 'master' · 1d4a666f
```
laskukorjailuja

Closes: #25, #27

Reviewed-by: @tuomari
```
  Tuomas Riihimäki committed Feb 28, 2014
  1d4a666f Browse Files
- fixes issues #25 and #27 · 74d18c5f
  Tuukka Kivilahti committed Feb 28, 2014
  
  74d18c5f Browse Files
- Merge branch 'master' into 'master' · c96ef66f
```
Kielenvaihtofix

korjaa issuen #18

Reviewed-by: @tuomari
```
  Tuomas Riihimäki committed Feb 28, 2014
  c96ef66f Browse Files
- language selector fix · bbbff801
  Tuukka Kivilahti committed Feb 28, 2014
  
  bbbff801 Browse Files
- user,cashier · b023a803
  Tuukka Kivilahti committed Feb 28, 2014
  
  b023a803 Browse Files
- Merge branch 'master' into 'master' · f689b093
```
terminalweb -stuff

Terminalweb -stuff, uus yritys

Reviewed-by: @tuomari
```
  Tuomas Riihimäki committed Feb 28, 2014
  f689b093 Browse Files
- bootstrapstuff · 18cd85fc
  Tuukka Kivilahti committed Feb 28, 2014
  
  18cd85fc
- permissions for moyaterminalweb, now there is examble of how we do basic permissions in there · 775eeb93
  Tuukka Kivilahti committed Feb 28, 2014
  
  775eeb93 Browse Files
- moyaterminalweb ottamista käyttöön uudelleen · 4084aa93
  Tuukka Kivilahti committed Feb 28, 2014
  
  4084aa93 Browse Files
25 Feb, 2014 1 commit
- property editor fix, now shows also longvalue · 5533d232
  Tuukka Kivilahti committed Feb 25, 2014
  
  5533d232 Browse Files
24 Feb, 2014 2 commits
- Merge branch 'master' into 'master' · a445e5ef
```
Laskujen voimassaoloaika konffittavaksi

fixes issue #28
```
  Tuomas Riihimäki committed Feb 24, 2014
  a445e5ef Browse Files
- configurable bill expire time · 5e39268b
  Tuukka Kivilahti committed Feb 24, 2014
  
  5e39268b
17 Feb, 2014 1 commit

Merge branch 'master' into 'master' · 1d4beab5

Ulkoasujuttuja and discount by role ja fixi siihen

Ulkoasujutukkeita, discount by role, sekä kaksi fixicommittia siihen.

Reviewed-by: tuomari

committed Feb 17, 2014

1d4beab5 Browse Files

16 Feb, 2014 2 commits
- ja fixi edelliseen · 125281d6
  Tuukka Kivilahti committed Feb 16, 2014
  
  125281d6 Browse Files
- user.getRoles() -> UserBean.findUsersRoles(user) · 44b92701
  Tuukka Kivilahti committed Feb 16, 2014
  
  44b92701
15 Feb, 2014 2 commits
- discount by role · df16c9aa
  Tuukka Kivilahti committed Feb 15, 2014
  
  df16c9aa Browse Files
- leiskmuutoksia · bb1a5f46
  Tuukka Kivilahti committed Feb 15, 2014
  
  bb1a5f46 Browse Files
14 Feb, 2014 7 commits
- Merge branch 'master' into 'master' · 32b14a07
```
Master
```
  Tuukka Kivilahti committed Feb 14, 2014
  32b14a07 Browse Files
- removed test file · ca6afddc
  Tuukka Kivilahti committed Feb 14, 2014
  
  ca6afddc Browse Files
- Merge branch 'master' into 'master' · 627fd563
```
Master
```
  Tuukka Kivilahti committed Feb 14, 2014
  627fd563 Browse Files
- plaa · b3d88bde
  Liv Haapala committed Feb 14, 2014
  
  b3d88bde Browse Files
- Merge branch 'issue-8' into 'master' · ab98daf7
```
Issue 8

Forcecrop kuville jotta backendiin menee vain oikeanlaista dataa.

Closes #8
```
  Tuukka Kivilahti committed Feb 14, 2014
  ab98daf7 Browse Files
- Image cropping code · 90734a3c
  Antti Tonkyra committed Feb 14, 2014
  
  90734a3c Browse Files
- Aspect ratio should be a constant value here · 11c61563
  Antti Tonkyra committed Feb 14, 2014
  
  11c61563 Browse Files
09 Feb, 2014 1 commit

Merge branch 'issue-4' into 'master' · 3b7655ce

Issue 4

Tagging support for actionlog. This drops the crew field from the database which essentially is just the role that the old messages were targeting. Crew is no longer needed because the crew can just follow tags. UI still could use some work but this should be more or less complete version of the functionality.

Merging this closes #4

committed Feb 09, 2014

3b7655ce Browse Files