6886 Commits

Author SHA1 Message Date
Emil Siverhall
ddedf1a698 removed filter string panel from checklist template data panel 2013-12-13 13:33:05 +01:00
Emil Siverhall
c20bfb7948 another research area/lombok issue 2013-12-13 12:46:59 +01:00
Emil Siverhall
2f68ff25ba Merge remote-tracking branch 'origin/develop' into develop 2013-12-13 12:03:45 +01:00
Emil Siverhall
4a120e17e4 toString fix on research area dropdown when authors submitting ideas 2013-12-13 11:57:09 +01:00
Emil Siverhall
48117498f7 only show project types with degreeLevels FIRST_CYCLE and SECOND_CYCLE when submitting supervisor ideas 2013-12-13 11:33:36 +01:00
Emil Siverhall
30c235c0eb fixed research area lombok/toString bug 2013-12-13 11:08:01 +01:00
fred-fri
ec5cb11806 filtering only on supervisors with targets 2013-12-13 15:20:46 +09:00
fred-fri
491efcfc9f removed delete 2013-12-13 13:58:05 +09:00
Per Lundholm
95ad828bbc Fixed some tests that lacked good data. 2013-12-12 17:18:41 +01:00
Per Lundholm
f69cfd757d Moved logic to their panels. 2013-12-12 17:00:39 +01:00
Per Lundholm
46de633efb Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 16:29:21 +01:00
Per Lundholm
7d40f506dd Removed warning. 2013-12-12 16:29:15 +01:00
Per Lundholm
8241c0aa12 Simplified panel hierarchy. 2013-12-12 16:28:51 +01:00
Richard
eac214152a Removed forum.css. 2013-12-12 16:26:09 +01:00
Leo
5903aca6a4 hides final seminar panel from supervisor sub tabs 2013-12-12 16:11:19 +01:00
Richard
edb1556642 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 16:08:31 +01:00
Richard
c9fb5da4b8 Fixed crash on ManageTargetsPanel. 2013-12-12 16:08:27 +01:00
Emil Siverhall
9e94f1ff88 renamed panel 2013-12-12 16:08:04 +01:00
Leo
6ae9118566 hides final seminar panel from overview page 2013-12-12 16:06:30 +01:00
Emil Siverhall
a7ef684ee5 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 16:04:00 +01:00
Emil Siverhall
97de33b457 only show target numbers for the project types available in the currently open application period(s) 2013-12-12 16:02:39 +01:00
Richard
92c387dcc9 Minor style changes to ManageTargetsPanel. 2013-12-12 15:56:10 +01:00
Leo
b3cde85899 Hides final seminar tab from project tab menu 2013-12-12 15:44:53 +01:00
Per Lundholm
306e7136d6 reformat 2013-12-12 15:38:13 +01:00
Emil Siverhall
5cc49a6efe Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 15:34:51 +01:00
Emil Siverhall
57501d0126 some refactoring in preliminary grading report panels 2013-12-12 15:34:35 +01:00
Per Lundholm
d32f3c882d Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 15:22:11 +01:00
Per Lundholm
a6c057563d Removed entity Question as it contained only a String 2013-12-12 15:21:54 +01:00
Emil Siverhall
45409a6467 no "success" feedback when examiners cancel their preliminary grading reports 2013-12-12 15:06:27 +01:00
Emil Siverhall
aff5c31d34 fixed some bad displays due to @Data annotation on ResearchArea and Unit 2013-12-12 14:44:21 +01:00
Emil Siverhall
7f06588439 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 14:23:18 +01:00
f2795bb090 Default filter for project type is now saved/loaded. 2013-12-12 14:01:12 +01:00
Emil Siverhall
4a4d8ded8d deleted FilterFormAreaPanel no longer being used 2013-12-12 13:58:49 +01:00
80a1b8c694 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 13:58:12 +01:00
Emil Siverhall
8fcf8e6c92 replaced FilterFormAreaPanel on supervisor idea pages 2013-12-12 13:53:49 +01:00
Emil Siverhall
0152cf45cd replaced FilterFormAreaPanel on author - all supervisor ideas 2013-12-12 13:45:00 +01:00
Emil Siverhall
d3959a9fe5 replaced FilterFormAreaPanel on admin -> ideas and manage targets pages 2013-12-12 13:40:00 +01:00
niklas3
84ccf5c202 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 13:37:40 +01:00
niklas3
abd7ae5508 Fixed over 9000 tests with NPE:s 2013-12-12 13:37:20 +01:00
Emil Siverhall
08a63ef510 ResearchAreaService now order alphabetically through sql query 2013-12-12 13:32:21 +01:00
c6cfd81dc4 Removed space to be consistent with CheckBoxMultipleChoice (add margin with input + label rule). 2013-12-12 13:29:48 +01:00
0e057114a4 Default filter for supervisor "role" is now saved/loaded. 2013-12-12 13:29:20 +01:00
6a75b921aa Renamed ajaxUpdate to onUpdate to match standard Wicket naming. 2013-12-12 13:17:20 +01:00
a3834308b0 Removed surrounding paragraph. 2013-12-12 13:16:20 +01:00
5e20bb223f Fixed basic styling. 2013-12-12 13:15:33 +01:00
81019da1ee Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 13:13:22 +01:00
3ec2dc6ed4 Fixed typo 2013-12-12 13:01:54 +01:00
1c21c6e6c8 Submitting the form cleared all other values so we're back to duplicated code. 2013-12-12 13:01:00 +01:00
Emil Siverhall
fc92c63f17 removed FilterFormUnitPanel since it could be easily replaced with an AjaxDropDownChoice 2013-12-12 12:05:35 +01:00
niklas3
5c999e59c6 Merge remote-tracking branch 'origin/develop' into develop 2013-12-12 11:19:31 +01:00