Commits · 775eeb93a7966e306e1cd0a7b38d3e61eb628b60 · Riina Antikainen / Moya

28 Feb, 2014 2 commits
- 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
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 Browse Files
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 4 commits
- 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
```
  Juho Salli committed Feb 09, 2014
  3b7655ce Browse Files
- Tagging UI / ActionLog tweaks · 939b39af
  Antti Tönkyrä committed Feb 09, 2014
  
  939b39af Browse Files
- Further filtering logic · 0e48a8ea
  Antti Tönkyrä committed Feb 09, 2014
  
  0e48a8ea
- remove crew in favor of tags, rename messagelist->index · 61143b14
  Antti Tönkyrä committed Feb 09, 2014
  
  61143b14
08 Feb, 2014 16 commits
- Initial support for ActionLog tags · fd914ee5
  Antti Tönkyrä committed Feb 08, 2014
  
  fd914ee5
- Merge branch 'tkfftk/moya-master' · a925af00
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
```
  Antti Tönkyrä committed Feb 08, 2014
  a925af00 Browse Files
- Merge branch 'issue-5' into 'master' · ffb63f69
```
Issue 5

This MR adds support for editing rules.

Merging this closes #5
```
  Tuukka Kivilahti committed Feb 08, 2014
  ffb63f69 Browse Files
- Merge branch 'testi' into 'master' · 2dac1aa8
```
Testi
```
  Juho Salli committed Feb 08, 2014
  2dac1aa8 Browse Files
- Add edits for tournament rules. · 08c88ff6
```
Closes #5
```
  Antti Tönkyrä committed Feb 08, 2014
  08c88ff6 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya · 84fcc6ec
  Tuukka Kivilahti committed Feb 08, 2014
  
  84fcc6ec Browse Files
- testiviesti · 554705a6
  Juho Salli committed Feb 08, 2014
  
  554705a6 Browse Files
- Merge branch 'master' of codecrew.fi:tkfftk/moya · 740714c0
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
```
  Tuukka Kivilahti committed Feb 08, 2014
  740714c0 Browse Files
- stuff · 713d0fad
  Tuukka Kivilahti committed Feb 08, 2014
  
  713d0fad Browse Files
- I hope these are needed · d7b1cf1d
  Tuukka Kivilahti committed Feb 08, 2014
  
  d7b1cf1d
- blob · 25ac88ab
  Tuukka Kivilahti committed Feb 08, 2014
  
  25ac88ab Browse Files
- stuff · 1b51cb8c
  Tuukka Kivilahti committed Feb 08, 2014
  
  1b51cb8c Browse Files
- bloab · ed3cab59
  Tuukka Kivilahti committed Feb 08, 2014
  
  ed3cab59 Browse Files
- Merge branch 'eventmgmt' into 'master' · 5ae54e65
```
Eventmgmt

Tapahtumienhallintaprojektin pohja.

Kääntyy ja näyttää etusivun. Ei vielä sisällä mitään toiminnallisuutta.

Aloitus issueen #2
```
  Tuomas Riihimäki committed Feb 08, 2014
  5ae54e65 Browse Files
- Merge branch 'silentajax' into 'master' · db1ef059
```
Silent ajax fail fix.

Korjaa hiljaiset ajaxfailaukset esim session timeoutissa.

Korjaa ainakin suurimman osan issuesta #3
```
  Tuomas Riihimäki committed Feb 08, 2014
  db1ef059 Browse Files
- Fixed silent ajax errros · 96b05c29
  Tuomas Riihimäki committed Feb 08, 2014
  
  96b05c29 Browse Files
07 Feb, 2014 3 commits
- Pyörivä pohja · 34291704
  Tuomas Riihimäki committed Feb 07, 2014
  
  34291704 Browse Files
- Added EventMgmtWeb · b2cf48b4
  Tuomas Riihimäki committed Feb 07, 2014
  
  b2cf48b4 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into devel · a082dff4
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
```
  Tuukka Kivilahti committed Feb 07, 2014
  a082dff4 Browse Files