13466 Commits

Author SHA1 Message Date
Golrokh Moattar
740c917978 Working on latest events panel- to be continued release-2014-03-27_17-09-01 2014-03-27 16:52:00 +01:00
80765225be Removed stupid if IE comments that are no longer used. 2014-03-27 16:09:30 +01:00
30afe6afb6 Removed stupid if IE comments that are no longer used. 2014-03-27 16:06:46 +01:00
ccfc925363 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 16:05:07 +01:00
57872e5905 Removed outputting of wicketpath since fitnesse is no longer used. 2014-03-27 16:05:00 +01:00
Richard
3104983869 Added class table and table-striped.
Removed div around button.
2014-03-27 16:00:30 +01:00
Richard
ba6d04e3c4 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.html
2014-03-27 15:56:16 +01:00
Richard
2da2065b5a Moved table within col-md-12. 2014-03-27 15:54:14 +01:00
0e9a7b775e Attempt at fixing test. 2014-03-27 15:43:45 +01:00
b3fd10e6fa Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 15:29:28 +01:00
Golrokh Moattar
3e805aceae ... 2014-03-27 15:28:12 +01:00
Golrokh Moattar
7ac3f36623 ... 2014-03-27 15:26:15 +01:00
Golrokh Moattar
b130a26671 just for showing richard 2014-03-27 15:21:03 +01:00
Golrokh Moattar
ac8d045e2c Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 15:16:46 +01:00
572ee3b4ff DateColumn now uses DateLabel. 2014-03-27 15:15:18 +01:00
9deef03521 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 15:08:57 +01:00
9efe947819 Minor HTML fixes. 2014-03-27 15:08:43 +01:00
70d108f919 Switched to a property module. Sorting one (sometimes two) items just is not that important.
If sorting really is demanded create LoadableDetachableModel that sorts in load().
2014-03-27 15:08:31 +01:00
Golrokh Moattar
c6b2ff2f10 Revert: removing label, using body instead (a058027f0a1cbf6d4be81e29b8a62bcf53d30bb5) 2014-03-27 15:00:54 +01:00
Golrokh Moattar
7ba3799457 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 14:57:38 +01:00
Golrokh Moattar
a66cb0ad22 Added resource bundles 2014-03-27 14:57:33 +01:00
44cef318ac No point being proper with detachable models when they do not get detached :) 2014-03-27 14:52:34 +01:00
Richard
da2b97c655 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 14:47:31 +01:00
Richard
7148311fb6 Styling of all projects -> Activity plan templates 2014-03-27 14:47:20 +01:00
e129b96c5f Fixed AdminEditTargetsPage to use proper detachable models. 2014-03-27 14:44:32 +01:00
7afd962a4d Fixed EditTargetPanel to not unpack models earlier than it has to. 2014-03-27 14:44:14 +01:00
Golrokh Moattar
435f93c14c Used EnumPropertyColumn in PeerRequestListPasnel for "Request status" 2014-03-27 14:43:37 +01:00
Golrokh Moattar
df78233bfd Created EnumPropertyColumn, and used in ProjectFilePanel 2014-03-27 14:36:32 +01:00
Richard
7efe38cd98 Styling of all projects -> peers
Replaced excel button with link
2014-03-27 14:35:34 +01:00
486501ce59 Added test for AdminApplicationPeriodsPanel. 2014-03-27 14:34:04 +01:00
c550a01274 Formatting. 2014-03-27 14:24:33 +01:00
fc41c4ea09 Changed application period admin page to use the new GenericDataPanel2. 2014-03-27 14:24:00 +01:00
d39dd7629e Added missing @Transactional to delete() in AbstractServiceImpl 2014-03-27 14:23:20 +01:00
3289d5db65 Removed useless local variable. 2014-03-27 14:11:57 +01:00
d9b1d54666 Changed to PropertyModel. 2014-03-27 14:09:39 +01:00
1e6fc2fd8e Updated web.xml to servlet 3.0. 2014-03-27 14:06:58 +01:00
Golrokh Moattar
0d5847681d Moved DateColumn in the Component package 2014-03-27 13:56:12 +01:00
Richard
6e4de25f9c Changed last updated date. release-2014-03-27_13-53-50 2014-03-27 13:44:55 +01:00
Richard
e228364e0f Changed "Tell me about milestones" to "About milestones". 2014-03-27 13:44:17 +01:00
Richard
a555bf6ee0 Moved glyphicon-user outside of the link so the irritating underline between the icon and link got removed. 2014-03-27 13:40:38 +01:00
Richard
acdd5782e0 Removed info about peer under project management since it's been moved to statistics. 2014-03-27 13:33:56 +01:00
211c07f989 SCIPRO-7224: Now uses the model instead of stale object. 2014-03-27 11:23:51 +01:00
5d5ddd329e SCIPRO-7186: The hidden field with events now start with an empty array instead of null. 2014-03-27 11:04:03 +01:00
Golrokh Moattar
5fb0992e01 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 11:00:05 +01:00
Emil Siverhall
bfd95df37e feedback columns to longtext in criterion/gradingcriterion 2014-03-27 09:30:47 +01:00
Emil Siverhall
2dfc3b73ab Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 08:25:28 +01:00
fred-fri
2199e838ef no hardcoded url 2014-03-27 16:15:04 +09:00
90169653a0 Removed Authorization.Failure enum as it was never used. 2014-03-26 20:43:48 +01:00
Golrokh Moattar
77495d46c0 Working on "LatestEventPanel" 2014-03-26 17:09:21 +01:00
c258b28780 Made project partner a sub-page of Ideas. release-2014-03-26_16-03-09 2014-03-26 15:45:28 +01:00