Commits · deb714e4e5d448929aa63a3611236b480676feda · Codecrew / Moya

20 Jul, 2014 12 commits
- now my job here is done, next we need some ui-designer etc · deb714e4
  Tuukka Kivilahti committed Jul 20, 2014
  
  deb714e4 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into template2014 · 94761edb
  Tuukka Kivilahti committed Jul 20, 2014
  
  94761edb Browse Files
- moar · e02b4071
  Tuukka Kivilahti committed Jul 20, 2014
  
  e02b4071 Browse Files
- moar layout, looks good · 4df85bf7
  Tuukka Kivilahti committed Jul 20, 2014
  
  4df85bf7 Browse Files
- new template base · 1a8dc855
  Tuukka Kivilahti committed Jul 20, 2014
  
  1a8dc855 Browse Files
- Merge branch 'annttu/moya-user-edit' · 6a21f422
  Tuomas Riihimäki committed Jul 20, 2014
  
  6a21f422 Browse Files
- Merge branch 'user-edit' of https://gitlab.codecrew.fi/annttu/moya into annttu/moya-user-edit · cbc75ac2
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
```
  Tuomas Riihimäki committed Jul 20, 2014
  cbc75ac2 Browse Files
- Merge branch 'themeChanger' into 'master' · eb5c9921
```
Theme changer

and topic tells it all.
```
  Tuomas Riihimäki committed Jul 20, 2014
  eb5c9921 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into themeChanger · f94c6b2e
  Tuukka Kivilahti committed Jul 20, 2014
  
  f94c6b2e Browse Files
- theme changer stuff, remember to update your maven · 9b4c35a5
  Tuukka Kivilahti committed Jul 20, 2014
  
  9b4c35a5
- Merge branch 'eventCalendar' into 'master' · 4cf1969d
```
Event calendar

Calendar for events, also some nice stuff for event dates.

This must be done afther my other mergerequest, bcause this also contains it's stuff, sorry for that, my pad.
```
  Juho Juopperi committed Jul 20, 2014
  4cf1969d Browse Files
- Merge branch 'manageParticipants' into 'master' · 39d85ac6
```
Manage participants and printing style

Topic tells it all.
```
  Juho Juopperi committed Jul 20, 2014
  39d85ac6 Browse Files
19 Jul, 2014 18 commits
- event date stuff and eventCalendar · 7d4faae0
  Tuukka Kivilahti committed Jul 19, 2014
  
  7d4faae0 Browse Files
- fixed user edit width · 9051a1f2
  Antti Jaakkola committed Jul 19, 2014
  
  9051a1f2 Browse Files
- better basic font size definition · e2a9504d
  Antti Jaakkola committed Jul 19, 2014
  
  e2a9504d Browse Files
- fixed change password button · 69ba0606
  Antti Jaakkola committed Jul 19, 2014
  
  69ba0606 Browse Files
- fixed user edit page · c22b5c27
  Antti Jaakkola committed Jul 19, 2014
  
  c22b5c27 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into manageParticipants · 65fee7e9
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
```
  Tuukka Kivilahti committed Jul 19, 2014
  65fee7e9 Browse Files
- now manager can manage participants. Also printing style · 05c013a2
  Tuukka Kivilahti committed Jul 19, 2014
  
  05c013a2 Browse Files
- Merge branch 'tournadmin' into 'master' · f2a58344
```
Turnausjutukkeita

revertoidaan myös n/a takaisin GameID defaultiksi
```
  Juho Juopperi committed Jul 19, 2014
  f2a58344 Browse Files
- Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into tournadmin · 6f11ecfc
  Antti Tönkyrä committed Jul 19, 2014
  
  6f11ecfc Browse Files
- Tournament stuff · 72070f4e
```
- Revert Game-ID to n/a on missing
- Better default action on enter in multiparticipate
- Delete buttons for tournament participants
```
  Antti Tönkyrä committed Jul 19, 2014
  72070f4e Browse Files
- Merge branch 'PlaceProductLimit' into 'master' · 00c8483c
```
Place product limit

Created product limitation web-interface.
```
  Juho Juopperi committed Jul 19, 2014
  00c8483c Browse Files
- Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into tournadmin · e2be07d6
  Antti Tönkyrä committed Jul 19, 2014
  
  e2be07d6 Browse Files
- Merge branch 'template' into 'master' · eca9d1d0
```
Tournament templates

Some changes to tournament page templates.
```
  Antti Tönkyrä committed Jul 19, 2014
  eca9d1d0 Browse Files
- Merge branch 'template' of gitlab.codecrew.fi:annttu/moya into template · cea957fd
```
Conflicts:
	code/MoyaWeb/WebContent/resources/templates/custom_components.css
```
  Antti Jaakkola committed Jul 19, 2014
  cea957fd Browse Files
- Tournament template changes · 2abcb672
```
Conflicts:
	code/MoyaWeb/WebContent/resources/templates/custom_components.css
```
  Antti Jaakkola committed Jul 19, 2014
  2abcb672 Browse Files
- Tournament admin functionality to deletes, no UI yet · 2366cd98
  Antti Tönkyrä committed Jul 19, 2014
  
  2366cd98 Browse Files
- Tournament template changes · 4c62894d
  Antti Jaakkola committed Jul 19, 2014
  
  4c62894d Browse Files
- Add product limitation editing user interface · 076f24a5
  Tuomas Riihimäki committed Jul 19, 2014
  
  076f24a5 Browse Files
18 Jul, 2014 9 commits
- Merge branch 'calendarForLectures' into 'master' · 1f78477b
```
Calendar for lectures

kalenteria pukkaa
```
  Tuomas Riihimäki committed Jul 18, 2014
  1f78477b Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into calendarForLectures · 684279e7
  Tuukka Kivilahti committed Jul 18, 2014
  
  684279e7 Browse Files
- calendars are quite nice · 620e1532
  Tuukka Kivilahti committed Jul 18, 2014
  
  620e1532 Browse Files
- Merge branch 'PlaceProductLimit' into 'master' · 8c4347c3
```
Place product limit

Merge some functions from PlaceMapBean to PlaceBean
Add limit check for Product against active GroupMemberships

Notice that automatic groupMembership creation is not yet implemented!

Kattoi: @tkfftk
```
  Tuukka Kivilahti committed Jul 18, 2014
  8c4347c3 Browse Files
- Merge branch 'translations' into 'master' · 64a30336
```
Käännöksiä

Lisätty puuttuneita käännöksiä.

Kattoi @tkfftk
```
  Tuukka Kivilahti committed Jul 18, 2014
  64a30336 Browse Files
- Add product limitation for places. · 4df4dc08
```
When product is billed there should be created new groupMembership (not implemented yet)
When limitation 'PLACES' is added for product, it should check how many places have been reserved
ie how mony groupmemberships with that product have been created and limit bought places.
```
  Tuomas Riihimäki committed Jul 18, 2014
  4df4dc08
- Move functions from PlaceMapBean to PlaceBean... (some cleanup) · f1f0b6b2
  Tuomas Riihimäki committed Jul 18, 2014
  
  f1f0b6b2 Browse Files
- Add 'placeProduct' field to group_membership in preparation of place reservation explosion · 02bc18ec
  Tuomas Riihimäki committed Jul 18, 2014
  
  02bc18ec Browse Files
- käännöksiä · 785f2a71
  Antti Jaakkola committed Jul 18, 2014
  
  785f2a71 Browse Files
27 Jun, 2014 1 commit

Merge branch 'master' into 'master' · 0699436d

Käyttäjien paitakoot

Paitakoko käyttäjille. Toi jsonjutuke on muuten hankala näin ensisilmäykseltä:
*murr*

committed Jun 27, 2014

0699436d Browse Files