Commits · a925af005661dc63d4eb3389eb5d3f3ba337f171 · Riina Antikainen / Moya · GitLab

08 Feb, 2014 15 commits
- 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 Browse Files
- 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 13 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
- Minoreita · 20ceaf74
  Tuomas Riihimäki committed Feb 07, 2014
  
  20ceaf74 Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya · 269b0dc2
  Tuomas Riihimäki committed Feb 07, 2014
  
  269b0dc2 Browse Files
- Merge branch 'devel' of codecrew.fi:tkfftk/moya into devel · f0c1ead7
  Tuukka Kivilahti committed Feb 07, 2014
  
  f0c1ead7 Browse Files
- stuff · 5952697b
  Tuukka Kivilahti committed Feb 07, 2014
  
  5952697b Browse Files
- Merge branch 'master' of codecrew.fi:codecrew/moya into devel · b73eabd9
  Tuukka Kivilahti committed Feb 07, 2014
  
  b73eabd9 Browse Files
- I hope these are needed · e9b7ffb4
  Tuukka Kivilahti committed Feb 07, 2014
  
  e9b7ffb4 Browse Files
- Signofftest merge. · e45bd54c
  Tuomas Riihimäki committed Feb 07, 2014
  
  e45bd54c Browse Files
- Merge branch 'master' into 'master' · 24d4a16c
```
Testimerge
```
  Tuomas Riihimäki committed Feb 07, 2014
  24d4a16c Browse Files
- mergetest · 5765c2fa
  Tuomas Riihimäki committed Feb 07, 2014
  
  5765c2fa Browse Files
- Jpegreader · ddecf255
  Tuomas Riihimäki committed Feb 07, 2014
  
  ddecf255 Browse Files
09 Jan, 2014 8 commits
- blob · 5e92dd22
  Tuukka Kivilahti committed Jan 09, 2014
  
  5e92dd22 Browse Files
- stuff · 4ebdfab7
  Tuukka Kivilahti committed Jan 09, 2014
  
  4ebdfab7 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 4e99f3db
  Tuukka Kivilahti committed Jan 09, 2014
  
  4e99f3db Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · ae04efd7
  Tuukka Kivilahti committed Jan 09, 2014
  
  ae04efd7 Browse Files
- bloab · 3fe563dc
  Tuukka Kivilahti committed Jan 09, 2014
  
  3fe563dc Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 70a195da
  Tuomas Riihimäki committed Jan 09, 2014
  
  70a195da Browse Files
- Toisen käyttäjän paikkatositteen tulostus. · 5ee58374
  Tuomas Riihimäki committed Jan 09, 2014
  
  5ee58374 Browse Files
- sisääntulostuffia · 4a46eba9
  Tuukka Kivilahti committed Jan 09, 2014
  
  4a46eba9 Browse Files
08 Jan, 2014 2 commits
- moar of bacroce · f33fd8a4
  Tuukka Kivilahti committed Jan 08, 2014
  
  f33fd8a4 Browse Files
- barcodea · cfaf2f9f
  Tuukka Kivilahti committed Jan 08, 2014
  
  cfaf2f9f
04 Jan, 2014 1 commit
- ulkoasuistua · de8be004
  Tuukka Kivilahti committed Jan 04, 2014
  
  de8be004 Browse Files
03 Jan, 2014 1 commit
- moar of vat · 30fc37b0
  Tuukka Kivilahti committed Jan 03, 2014
  
  30fc37b0 Browse Files