Commits · dbe070a007a037a18f69bbcec25d4f55331b3e1b · Riina Antikainen / Moya

13 Aug, 2014 3 commits

Merge branch 'participantRemove' into 'master' · dbe070a0

Participant remove

Kurssitauhkaa, sekä tyylityksen muokkaus takas 90% -jutuksi -> se kiinteä rikko monia listoja (napit ulos tilasta) -> tarttee testata hyvin.

Ja kettu, pitää tännekkin näemmä muuttaa se i18n tabitustäppä.

committed Aug 13, 2014

dbe070a0 Browse Files

Merge remote-tracking branch 'origin/master' into participantRemove · cf8ada59

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

committed Aug 13, 2014

cf8ada59 Browse Files

Merge branch 'template2014' into 'master' · 64433b09
```
primelayout

New template which uses totally primefaces stuff with minium css-styling.
```
Juho Juopperi committed Aug 13, 2014
64433b09 Browse Files

25 Jul, 2014 2 commits
- and moar · 55edff1c
  Tuukka Kivilahti committed Jul 25, 2014
  
  55edff1c Browse Files
- print empty lines also for lecture · 99c8ec85
  Tuukka Kivilahti committed Jul 25, 2014
  
  99c8ec85 Browse Files
24 Jul, 2014 2 commits
- correct default theme · 5dffe1ae
  Tuukka Kivilahti committed Jul 24, 2014
  
  5dffe1ae Browse Files
- style rewert and participant remove stuff, Also one bugfix · 1c22d9ef
  Tuukka Kivilahti committed Jul 24, 2014
  
  1c22d9ef
20 Jul, 2014 15 commits
- Merge branch 'PrepaidCredit' into 'master' · 0d96f0c3
```
Deprekoidaan 'Ostettaessa luotava tuote' (PREPAID_INSTANT_CREATE) tuoteflagi

Aikaisemmin käyttäjälle on luotu laskun merkityksi maksamisen yhteydessä vain jos nyt deprekoitava
'PREPAID_INSTANT_CREATE' flagi oli päällä. Haluttu toiminnallisuus on että tuote luodaan käyttäjälle oletuksena ja
tuotetta _ei_ luoda vain jos 'PREPAID_CREDIT' flagi on päällä.

Closes: #34
```
  Tuukka Kivilahti committed Jul 20, 2014
  0d96f0c3 Browse Files
- moar logical name · 91914419
  Tuukka Kivilahti committed Jul 20, 2014
  
  91914419 Browse Files
- 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
- Deprekoidaan 'Ostettaessa luotava tuote' (PREPAID_INSTANT_CREATE) tuoteflagi · d45f4b50
```
Aikaisemmin käyttäjälle on luotu laskun merkityksi maksamisen yhteydessä vain jos nyt deprekoitava
'PREPAID_INSTANT_CREATE' flagi oli päällä. Haluttu toiminnallisuus on että tuote luodaan käyttäjälle oletuksena ja
tuotetta _ei_ luoda vain jos 'PREPAID_CREDIT' flagi on päällä.

Closes: #34
```
  Tuomas Riihimäki committed Jul 20, 2014
  d45f4b50 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
- 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