Commits · 81f2aa0bcce99f92a5b4ae792523d2c1b366f07d · Riina Antikainen / Moya · GitLab

31 Aug, 2013 38 commits
- Merge branch 'devel' of codecrew.fi:bortal into devel · 81f2aa0b
```
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
```
  Juho Salli committed Aug 31, 2013
  81f2aa0b Browse Files
- IncomingFlow UIta korjailtu · 499a5b25
  Juho Salli committed Aug 31, 2013
  
  499a5b25 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · f4d8f93b
  Antti Jaakkola committed Aug 31, 2013
  
  f4d8f93b Browse Files
- i18n translations for eventEdit · e95be4fc
  Antti Jaakkola committed Aug 31, 2013
  
  e95be4fc Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · c5592bac
  Antti Tonkyra committed Aug 31, 2013
  
  c5592bac Browse Files
- Tournamentjuttuja · d6fa9ae9
  Antti Tonkyra committed Aug 31, 2013
  
  d6fa9ae9
- i18n translations · 951bd9e5
  Antti Jaakkola committed Aug 31, 2013
  
  951bd9e5 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · dca86dcc
  Antti Jaakkola committed Aug 31, 2013
  
  dca86dcc Browse Files
- I18N translations · d46b0a47
  Antti Jaakkola committed Aug 31, 2013
  
  d46b0a47 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 0923d92a
  Tuomas Riihimäki committed Aug 31, 2013
  
  0923d92a Browse Files
- Fix uploadservlet stream · 457c7372
  Tuomas Riihimäki committed Aug 31, 2013
  
  457c7372 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 8f92fad3
  Antti Tonkyra committed Aug 31, 2013
  
  8f92fad3 Browse Files
- More on tournament creation · 39393d8f
  Antti Tonkyra committed Aug 31, 2013
  
  39393d8f Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 717d08dc
  Antti Jaakkola committed Aug 31, 2013
  
  717d08dc Browse Files
- i18n translations · 21a12ee0
  Antti Jaakkola committed Aug 31, 2013
  
  21a12ee0 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 723eeb02
  Tuomas Riihimäki committed Aug 31, 2013
  
  723eeb02 Browse Files
- Primefaces 4.0, menujuttua. · 703de789
  Tuomas Riihimäki committed Aug 31, 2013
  
  703de789
- menu and login change · 68240770
  Petri Jarvisalo committed Aug 31, 2013
  
  68240770 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 24efb803
  Antti Jaakkola committed Aug 31, 2013
  
  24efb803 Browse Files
- Fix DBModelFacade returning multiple last revisions :) · 4cdd2643
  Antti Tonkyra committed Aug 31, 2013
  
  4cdd2643
- Vituttaako list · 0619344e
  Antti Jaakkola committed Aug 31, 2013
  
  0619344e Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 519484ca
  Antti Tonkyra committed Aug 31, 2013
  
  519484ca Browse Files
- Add game to tournament and update db · 1aaf2bac
  Antti Tonkyra committed Aug 31, 2013
  
  1aaf2bac Browse Files
- myGroups view ui · ffdbac12
  Petri Jarvisalo committed Aug 31, 2013
  
  ffdbac12 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · ad311f94
  Petri Jarvisalo committed Aug 31, 2013
  
  ad311f94 Browse Files
- accountEvents ui update · 8514d4d0
  Petri Jarvisalo committed Aug 31, 2013
  
  8514d4d0
- fix xmlns, add tournament funcs · 155aceb3
  Antti Tonkyra committed Aug 31, 2013
  
  155aceb3 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · b3938c62
  Antti Tonkyra committed Aug 31, 2013
  
  b3938c62 Browse Files
- Tournament creation wizard i18nage · 10f0d1ae
  Antti Tonkyra committed Aug 31, 2013
  
  10f0d1ae Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 17ba21f7
  Tuomas Riihimäki committed Aug 31, 2013
  
  17ba21f7 Browse Files
- Force encoding to utf-8 · 69e4f672
  Tuomas Riihimäki committed Aug 31, 2013
  
  69e4f672
- ui · 92a10fbc
  Petri Jarvisalo committed Aug 31, 2013
  
  92a10fbc Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 14969b65
  Tuomas Riihimäki committed Aug 31, 2013
  
  14969b65 Browse Files
- Fix errors from web project.. · 110655ad
  Tuomas Riihimäki committed Aug 31, 2013
  
  110655ad Browse Files
- layout fixes · e4e45005
  Petri Jarvisalo committed Aug 31, 2013
  
  e4e45005 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 24e605cb
```
Conflicts:
	code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
```
  Petri Jarvisalo committed Aug 31, 2013
  24e605cb Browse Files
- html5/css3 leiska · d967f9d4
  Petri Jarvisalo committed Aug 31, 2013
  
  d967f9d4 Browse Files
- Random minor changes. Merge DbModel and bootstrapbean from talyn. · f03d8ff6
  Tuomas Riihimäki committed Aug 31, 2013
  
  f03d8ff6
19 Aug, 2013 2 commits
- Poistettu ylimääräisyyksiä. · dcaf6932
  Tuomas Riihimäki committed Aug 19, 2013
  
  dcaf6932
- Application.xml eariin. · c6575666
  Tuomas Riihimäki committed Aug 19, 2013
  
  c6575666