Commits · 0708a0e5da25f9b6a2f21c3a5ece5341d6b4baee · Codecrew / Moya · GitLab

08 Feb, 2014 19 commits
- Merge branch 'barcodefuckup' of gitlab.codecrew.fi:tkfftk/moya into barcodefuckup · 0708a0e5
  Juho Salli committed Feb 08, 2014
  
  0708a0e5 Browse Files
- Added missing CardCode class. · 4fcb0870
  Juho Salli committed Feb 08, 2014
  
  4fcb0870 Browse Files
- and also databasechanges · 6c9b91d4
  Tuukka Kivilahti committed Feb 08, 2014
  
  6c9b91d4 Browse Files
- Merge branch 'barcodefuckup' of codecrew.fi:tkfftk/moya into barcodefuckup · add711cc
  Tuukka Kivilahti committed Feb 08, 2014
  
  add711cc Browse Files
- barcode stuff for printedcard and readerevent · 2e74c684
  Tuukka Kivilahti committed Feb 08, 2014
  
  2e74c684
- Removed cardbarcode stuff and added cardcode thingys. · 6c45b6a2
  Juho Salli committed Feb 08, 2014
  
  6c45b6a2
- Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into barcodefuckup · 44d3fd0f
  Juho Salli committed Feb 08, 2014
  
  44d3fd0f Browse Files
- Merge branch 'testi' into 'master' · 2dac1aa8
```
Testi
```
  Juho Salli committed Feb 08, 2014
  2dac1aa8 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
- I hope these are needed · d7b1cf1d
  Tuukka Kivilahti committed Feb 08, 2014
  
  d7b1cf1d
- blob · 25ac88ab
  Tuukka Kivilahti committed Feb 08, 2014
  
  25ac88ab
- 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
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
- 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
- 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
- sisääntulostuffia · 4a46eba9
  Tuukka Kivilahti committed Jan 09, 2014
  
  4a46eba9 Browse Files