13414 Commits

Author SHA1 Message Date
c258b28780 Made project partner a sub-page of Ideas. release-2014-03-26_16-03-09 2014-03-26 15:45:28 +01:00
960027de2b Removed the text when selecting keywords. 2014-03-26 15:18:15 +01:00
Richard
37335b1dd5 Removed anchor link from PeerPortalHeader and PeerRequestSubmissionPanel 2014-03-26 15:07:17 +01:00
0db8d731a1 Moved the missing HTML. 2014-03-26 14:46:42 +01:00
dbcf60344b Removed icons from MenuItem. 2014-03-26 14:35:44 +01:00
cc611ba913 Removed unused constructors. 2014-03-26 14:22:49 +01:00
2ceafb95e0 Moved DeactivatableDatePickerPanel to reduce cycles. 2014-03-26 14:22:31 +01:00
de49274254 Moved PageParameterKeys to reduce cycles. 2014-03-26 14:17:24 +01:00
b59866a075 Fixed bad count query. 2014-03-26 14:11:07 +01:00
Richard
0394cf4a93 Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 13:42:50 +01:00
Richard
95941a1450 Styling of the pagination. 2014-03-26 13:40:31 +01:00
Golrokh Moattar
757d8bba02 Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 13:33:42 +01:00
Golrokh Moattar
e3add3bff3 Fixed test problem 2014-03-26 13:29:50 +01:00
Golrokh Moattar
de442b1918 Added FileSource to the list in the Files tap 2014-03-26 13:24:10 +01:00
Emil Siverhall
0589de8cec test fix 2014-03-26 13:23:15 +01:00
Emil Siverhall
d9f37b3b1e Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 13:08:19 +01:00
Emil Siverhall
dfe58b0314 listadaptermodel at seminar opposition panel 2014-03-26 13:04:54 +01:00
3e0898acf2 Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 13:03:35 +01:00
bc0e7aff4e Wrapped the Set in a ListAdapterModel. 2014-03-26 13:03:28 +01:00
Emil Siverhall
1ea117d378 list -> set on final seminar participations 2014-03-26 13:01:37 +01:00
1ff8d25382 Removed workaround since we're switching to Set instead of List. 2014-03-26 12:59:34 +01:00
22114e84fa Fixed proper equals/hashCode. 2014-03-26 12:59:07 +01:00
9fbc446428 Workaround to a Hibernate bug. 2014-03-26 12:54:39 +01:00
Golrokh Moattar
5988abf561 Added FileSource to the storeFile service to show where the file comes from 2014-03-26 11:34:19 +01:00
865040bb1d Fixed warnings. 2014-03-26 11:13:12 +01:00
337b9f8ece Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 11:08:16 +01:00
8cb0a9de13 Removed FinalSeminarActiveParticipationRepo. 2014-03-26 11:07:53 +01:00
fred-fri
5b3667169d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-03-26 19:06:54 +09:00
fred-fri
aa701d439d test 2014-03-26 19:06:24 +09:00
Golrokh Moattar
e437ea7d3f Added FileSource Enum as a property to fileDescription 2014-03-26 11:05:49 +01:00
Golrokh Moattar
45c086571d Added a fileSource Column to FileDescriptionTable 2014-03-26 11:03:00 +01:00
Emil Siverhall
a8d9f3593e activated/inactivate projects fix 2014-03-26 10:58:05 +01:00
Emil Siverhall
7005c8ea7b hide perform review when finished 2014-03-26 10:48:18 +01:00
Emil Siverhall
14819f502c ignore exceptions on peer review submission transactional annotation 2014-03-26 10:38:48 +01:00
Richard
7817ad0469 Added bootstrap styling to radio buttons and checkbox on FinalSeminarDataPanel. 2014-03-26 10:36:38 +01:00
fred-fri
b6893d08f1 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-03-26 18:15:56 +09:00
Emil Siverhall
bfb96d3681 Merge remote-tracking branch 'origin/develop' into develop 2014-03-26 10:07:12 +01:00
Emil Siverhall
72c738b756 ajax, yay 2014-03-26 10:06:55 +01:00
b9d5c5545c Disabled "perform a review" link if you are already on that page. 2014-03-26 09:44:07 +01:00
693f0beee4 Remove isThesisFile from FileDescription. 2014-03-26 09:39:38 +01:00
fred-fri
aec0017b24 bleh 2014-03-26 16:48:44 +09:00
Emil Siverhall
c00362e1e6 peers 2014-03-26 08:26:10 +01:00
fred-fri
6c11df307c fixed hierarchy 2014-03-26 15:18:40 +09:00
fred-fri
fa55c0ed13 implemented method 2014-03-26 14:13:21 +09:00
fred-fri
0f66c3864d changed to ajaxconfirmationlink for deletion 2014-03-26 13:43:02 +09:00
fred-fri
91618b29df added confirmation 2014-03-26 12:33:47 +09:00
fred-fri
a058027f0a removing label, using body instead 2014-03-26 11:53:34 +09:00
fred-fri
d85f708bc7 adding linkpanel, just link doesnt render as link 2014-03-26 11:30:10 +09:00
Emil Siverhall
f06407fdf2 Merge remote-tracking branch 'origin/develop' into develop 2014-03-25 20:45:52 +01:00
Emil Siverhall
d62d19fe99 editing of internal users research areas fixed 2014-03-25 20:45:18 +01:00