Commits · bd651b98755461e86adcf8bc559dbf03b7d25cf0 · Linnea Samila / Moya

30 Mar, 2013 4 commits

mavenize · bd651b98
Juho Juopperi committed Mar 30, 2013

bd651b98

Merge branch 'devel' into feature/maven · ad13358f

Conflicts:
	code/MoyaAuthModule/.classpath
	code/MoyaAuthModule/.settings/org.eclipse.jdt.core.prefs
	code/MoyaAuthModule/.settings/org.eclipse.wst.common.project.facet.core.xml
	code/MoyaAuthModuleClient/.settings/org.eclipse.jdt.core.prefs
	code/MoyaBeans/.classpath
	code/MoyaBeans/.settings/org.eclipse.jdt.core.prefs
	code/MoyaBeans/.settings/org.eclipse.wst.common.project.facet.core.xml
	code/MoyaBeansClient/.classpath
	code/MoyaBeansClient/.settings/org.eclipse.jdt.core.prefs
	code/MoyaDatabase/.classpath
	code/MoyaDatabase/.settings/org.eclipse.jdt.core.prefs
	code/MoyaDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
	code/MoyaTerminalWeb/.settings/org.eclipse.jdt.core.prefs
	code/MoyaUtilities/.classpath
	code/MoyaUtilities/.settings/org.eclipse.jdt.core.prefs
	code/MoyaWeb/.classpath
	code/MoyaWeb/.settings/org.eclipse.jdt.core.prefs

committed Mar 30, 2013

ad13358f Browse Files

ignores · 95715ae3
Juho Juopperi committed Mar 30, 2013

95715ae3 Browse Files
Moved stuff · 20b78981
Tuomas Riihimäki committed Mar 30, 2013

20b78981

29 Mar, 2013 1 commit
- Changed jre from 1.6 to 1.7 (and some other randoms.. · 0b5618f1
  Tuomas Riihimäki committed Mar 29, 2013
  
  0b5618f1
23 Feb, 2013 1 commit
- settings for placecode printing (print only own and use userid instead of placec… · c8e39a5c
```
…ode), fixed boolean eventsetting
```
  Tuukka Kivilahti committed Feb 23, 2013
  c8e39a5c Browse Files
19 Feb, 2013 4 commits
- Fix eventuser creation when user logs in to new event.. · 4d3b6587
  Tuomas Riihimäki committed Feb 19, 2013
  
  4d3b6587 Browse Files
- Scopeja väärästä luokasta oikeaan (javax.faces.bean.RequestScoped -> javax.enter… · 98e275cb
```
…prise.context.RequestScoped)
```
  Tuomas Riihimäki committed Feb 19, 2013
  98e275cb
- Merge branch 'master' into devel · 8ef7d5df
  Tuukka Kivilahti committed Feb 19, 2013
  
  8ef7d5df Browse Files
- vectorama language stuff · 5112c5f1
  Tuukka Kivilahti committed Feb 19, 2013
  
  5112c5f1 Browse Files
07 Feb, 2013 1 commit
- it's nice to have some name · 1fd46c4e
  Tuukka Kivilahti committed Feb 07, 2013
  
  1fd46c4e Browse Files
05 Feb, 2013 5 commits
- typo · 1028fdb6
  Juho Juopperi committed Feb 05, 2013
  
  1028fdb6 Browse Files
- canonical metamodel · d990ab86
  Juho Juopperi committed Feb 05, 2013
  
  d990ab86 Browse Files
- Merge branch 'master' into devel · d553d02f
  Tuomas Riihimäki committed Feb 05, 2013
  
  d553d02f Browse Files
- Fiksailtu insomnia2-leiskaa. Random optimointeja profilerkikkailun jälkeen. · a415a308
  Tuomas Riihimäki committed Feb 05, 2013
  
  a415a308
- printing card on incoming/printCard -page, preparing is nice · 4c6805b9
  Tuukka Kivilahti committed Feb 05, 2013
  
  4c6805b9 Browse Files
04 Feb, 2013 5 commits
- korjasin, jenkins test · ae05b26a
  Tuukka Kivilahti committed Feb 04, 2013
  
  ae05b26a Browse Files
- rikoin, jenkins test · 179a41f6
  Tuukka Kivilahti committed Feb 04, 2013
  
  179a41f6 Browse Files
- some cleanup and stuff for incoming flow · 25bcba58
  Tuukka Kivilahti committed Feb 04, 2013
  
  25bcba58 Browse Files
- auth module dependencies · c1bdbb5e
  Juho Juopperi committed Feb 04, 2013
  
  c1bdbb5e Browse Files
- conversion to maven project · aea0943a
  Juho Juopperi committed Feb 04, 2013
  
  aea0943a Browse Files
03 Feb, 2013 2 commits
- Merge branch 'readersToEwerywhere' into devel · 3d8c9485
  Tuukka Kivilahti committed Feb 03, 2013
  
  3d8c9485 Browse Files
- something working · 4a6f4d4a
  Builder committed Feb 03, 2013
  
  4a6f4d4a Browse Files
02 Feb, 2013 4 commits
- Merge branch 'devel' · 6b1f948c
```
Conflicts:
	code/MoyaWeb/WebContent/admin/adduser/login.xhtml
	code/MoyaWeb/WebContent/resources/cditools/login/login.xhtml
```
  Tuomas Riihimäki committed Feb 02, 2013
  6b1f948c Browse Files
- Backend function for previous commit · 54e3659f
  Tuomas Riihimäki committed Feb 02, 2013
  
  54e3659f
- Fix email outputText to correct place. · fe527198
  Tuomas Riihimäki committed Feb 02, 2013
  
  fe527198 Browse Files
- Add permission checking for placemap · 66aa15b9
  Tuomas Riihimäki committed Feb 02, 2013
  
  66aa15b9
20 Jan, 2013 3 commits
- IncomingFlow · 395e23af
  Liv Haapala committed Jan 20, 2013
  
  395e23af Browse Files
- moar reader stuff · f57f1ee3
  Tuukka Kivilahti committed Jan 20, 2013
  
  f57f1ee3
- reader stuff · fab92223
  Tuukka Kivilahti committed Jan 20, 2013
  
  fab92223
30 Dec, 2012 1 commit
- readeria pukkaa · 042f7861
  Tuukka Kivilahti committed Dec 30, 2012
  
  042f7861 Browse Files
28 Dec, 2012 6 commits
- error login redirect is now configurable · 2b919df9
  Tuukka Kivilahti committed Dec 28, 2012
  
  2b919df9 Browse Files
- Merge branch 'devel' of codecrew.fi:bortal into devel · 35b9f5df
  Tuukka Kivilahti committed Dec 28, 2012
  
  35b9f5df Browse Files
- bug hunted from barcodes · fc1bbff6
  Tuukka Kivilahti committed Dec 28, 2012
  
  fc1bbff6 Browse Files
- bug hunted from barcodes · e977367c
  Tuukka Kivilahti committed Dec 28, 2012
  
  e977367c Browse Files
- Merge branch 'devel' · 39c71bf1
  Tuomas Riihimäki committed Dec 28, 2012
  
  39c71bf1 Browse Files
- Pientä kaikkea skyneteille. · 9add6114
  Tuomas Riihimäki committed Dec 28, 2012
  
  9add6114
27 Dec, 2012 1 commit
- uutta menua kuosiin · 6d11ea6b
  Tuomas Riihimäki committed Dec 27, 2012
  
  6d11ea6b
22 Dec, 2012 2 commits
- Merge branch 'devel' · 76ed1caf
  Tuomas Riihimäki committed Dec 22, 2012
  
  76ed1caf Browse Files
- Lisätty CSV exporttiin käyttäjän paikka. · 9fcd6a9d
  Tuomas Riihimäki committed Dec 22, 2012
  
  9fcd6a9d