13466 Commits

Author SHA1 Message Date
leosu
1a58b89c21 better feedback and link to login page 2014-02-26 11:36:03 +01:00
leosu
9e47d4cc25 Merge remote-tracking branch 'origin/develop' into develop 2014-02-26 11:04:32 +01:00
leosu
d81c10c8ee fixed failing test 2014-02-26 11:04:25 +01:00
fred-fri
072c9aa72b moving applicationperiodprojecttype stuff 2014-02-26 18:32:18 +09:00
fred-fri
1bfa14c83d moving project stuff 2014-02-26 18:15:17 +09:00
fred-fri
d7a9422ce2 moving phd stuff 2014-02-26 18:12:43 +09:00
fred-fri
5b7834d639 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-02-26 18:04:59 +09:00
fred-fri
f8c61154be moving project stuff 2014-02-26 18:03:56 +09:00
Emil Siverhall
a368dca027 Merge remote-tracking branch 'origin/develop' into develop 2014-02-26 09:43:30 +01:00
Emil Siverhall
d58e10f71b switch from FireFoxDriver to HtmlUnitDriver 2014-02-26 09:43:17 +01:00
leosu
ec49af8add Merge remote-tracking branch 'origin/develop' into develop 2014-02-26 09:36:35 +01:00
leosu
171489f7d3 first time registration triggered with empty database 2014-02-26 09:36:22 +01:00
Golrokh Moattar
2a24b6b86d Merge remote-tracking branch 'origin/develop' into develop 2014-02-26 09:34:12 +01:00
11b795aa16 Fixed suppression 2014-02-26 09:13:17 +01:00
fred-fri
ea33b02f0c bug fixes 2014-02-26 12:59:11 +09:00
fred-fri
e82957b3f7 bug fixes 2014-02-26 12:23:18 +09:00
Emil Siverhall
4b75e6f804 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 17:00:25 +01:00
Emil Siverhall
691e5980aa sprint annotation for now.. 2014-02-25 17:00:12 +01:00
Emil Siverhall
1ac7ad766c project state fitnesse tests.. 2014-02-25 16:57:39 +01:00
Golrokh Moattar
e14d13abb3 Added a link to ProjectDetailPage 2014-02-25 16:13:06 +01:00
leosu
d67aab9d01 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 15:52:34 +01:00
leosu
6a894afc5b FirstTimeRegistrationPage 2014-02-25 15:52:09 +01:00
leosu
7ed8761a66 cleanup 2014-02-25 15:51:56 +01:00
Richard
769703962a Reverted deletion of float:left on header div a. 2014-02-25 15:46:15 +01:00
Golrokh Moattar
098680eb25 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 14:14:19 +01:00
3981194e79 Removed stupid callbacks. 2014-02-25 14:11:51 +01:00
Golrokh Moattar
c898bc390e Problems with AdminProjectTypePanel were fixed 2014-02-25 14:09:21 +01:00
leosu
5847d33210 fixed faulty test 2014-02-25 13:55:15 +01:00
leosu
738ee4be05 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 13:31:20 +01:00
leosu
d709d5ba30 fixed faulty test 2014-02-25 13:31:14 +01:00
3f8c5d987b Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 13:26:18 +01:00
55ca5de080 Show feedback on delete. 2014-02-25 13:26:12 +01:00
8e350a8e4f Switched from stale shitty model to detachable one. 2014-02-25 13:23:14 +01:00
060bb51a1c Added workaround for Wicket and Hibernate interaction which caused setObject to never get called and the newly generated id to get cached. Now tries to fetch it on detach() 2014-02-25 13:18:16 +01:00
fred-fri
9d169b3dd7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 19:59:57 +09:00
fred-fri
36971ce32c project state tests 2014-02-25 19:59:43 +09:00
leosu
4f39c4f595 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 11:40:08 +01:00
leosu
a2ffedf569 notification for activation and deactivation of project 2014-02-25 11:40:03 +01:00
fred-fri
6501b6c808 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 19:30:59 +09:00
fred-fri
6a176d1ff8 project state tests 2014-02-25 19:30:33 +09:00
c76ebd5dd0 Cascade in database since Hibernate sometimes misses. 2014-02-25 11:09:42 +01:00
b27089d570 Merge remote-tracking branch 'origin/develop' into develop 2014-02-25 11:05:44 +01:00
30ab319194 Sends created event when the seminar is created and change events when something changes. 2014-02-25 11:05:38 +01:00
4033406387 Shows create or update depending on if the seminar exists or not. 2014-02-25 10:59:19 +01:00
Golrokh Moattar
83f0f3dd9c Suppress auto-wiring warning 2014-02-25 10:54:48 +01:00
Golrokh Moattar
7b4c25a743 Admin can search Users by their EmailAddress 2014-02-25 10:51:17 +01:00
leosu
96b28f90ec comment punish also looks at new PreliminaryGradingReport 2014-02-25 10:46:27 +01:00
b39c31c82e Delete link is only visible if there is an id present on the seminar. 2014-02-25 10:37:25 +01:00
24f2e864f8 Added setCancelled/isCancelled methods to FinalSeminar that delegates to deleted to better communicate intent even if it is still stupid.
Successful submit in CRUD panel now uncancels the seminar.
2014-02-25 10:33:46 +01:00
leosu
aaa9f7021c cleanup 2014-02-25 10:24:00 +01:00