Commits · 2ee1897643c90c81151fc21ffbb19cb021f996b8 · Riina Antikainen / Moya · GitLab

01 Sep, 2013 18 commits
- Merge branch 'devel' of codecrew.fi:bortal into devel · 2ee18976
  Antti Tonkyra committed Sep 01, 2013
  
  2ee18976 Browse Files
- Implement endConversation for GenericCDIBean, tournament stuff · 35d1d257
  Antti Tonkyra committed Sep 01, 2013
  
  35d1d257
- redirect from index.html to frontpage · bdc1a5a4
  Tuomas Riihimäki committed Sep 01, 2013
  
  bdc1a5a4
- Merge branch 'devel' of codecrew.fi:bortal into devel · e772f104
  Antti Tonkyra committed Sep 01, 2013
  
  e772f104 Browse Files
- Stuffed chicken, more tournament · a28279e8
  Antti Tonkyra committed Sep 01, 2013
  
  a28279e8 Browse Files
- Tournament translations · 08d5043b
  Antti Jaakkola committed Sep 01, 2013
  
  08d5043b Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · c6e430ea
  Antti Tonkyra committed Sep 01, 2013
  
  c6e430ea Browse Files
- Tournament shenanigans · 9c15227b
  Antti Tonkyra committed Sep 01, 2013
  
  9c15227b Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · a4ddde17
  Tuukka Kivilahti committed Sep 01, 2013
  
  a4ddde17 Browse Files
- logout fix · a248c335
  Tuukka Kivilahti committed Sep 01, 2013
  
  a248c335 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · d3bda6e2
  Antti Jaakkola committed Sep 01, 2013
  
  d3bda6e2 Browse Files
- more and more translations. · d3a4882c
  Antti Jaakkola committed Sep 01, 2013
  
  d3a4882c Browse Files
- tournament stuffation · 863ae773
  Antti Tonkyra committed Sep 01, 2013
  
  863ae773
- Merge branch 'devel' of codecrew.fi:bortal into devel · 1dec9471
  Antti Tonkyra committed Sep 01, 2013
  
  1dec9471 Browse Files
- tournament creation · 695806c2
  Antti Tonkyra committed Sep 01, 2013
  
  695806c2 Browse Files
- shop/createBill.jsf turha inputbox poistettu · 08a4c1be
  Juho Salli committed Sep 01, 2013
  
  08a4c1be Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 4f3d0e0e
  Tuomas Riihimäki committed Sep 01, 2013
  
  4f3d0e0e Browse Files
- Top menu changin changes also lower level menus · 28a3b885
  Tuomas Riihimäki committed Sep 01, 2013
  
  28a3b885
31 Aug, 2013 22 commits
- Merge branch 'devel' of codecrew.fi:bortal into devel · bd291409
```
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
```
  Antti Jaakkola committed Aug 31, 2013
  bd291409
- Added some more i18n cryptography · 631a54be
  Antti Jaakkola committed Aug 31, 2013
  
  631a54be Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 521247ce
  Tuomas Riihimäki committed Aug 31, 2013
  
  521247ce Browse Files
- Valitun sivun menu jää auki. · 8b6bd034
  Tuomas Riihimäki committed Aug 31, 2013
  
  8b6bd034 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 49b442a1
  Juho Salli committed Aug 31, 2013
  
  49b442a1 Browse Files
- 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
- new menu structure · afc66ba9
  Petri Jarvisalo committed Aug 31, 2013
  
  afc66ba9 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