13687 Commits

Author SHA1 Message Date
fb24dd3f06 Changed so that file can be downloaded by clicking on the name in addition to the icons. 2014-03-28 10:25:08 +01:00
fred-fri
307d54b5b8 urls 2014-03-28 18:20:33 +09:00
Emil Siverhall
58067f4f2d no need to complicate things 2014-03-28 10:10:43 +01:00
693f387ae3 Formatting. 2014-03-28 10:10:00 +01:00
fred-fri
3b671bfd6e notification fixes 2014-03-28 18:07:38 +09:00
Emil Siverhall
d69c11ddda happy days 2014-03-28 10:00:08 +01:00
fred-fri
3c4e832033 fixes 2014-03-28 16:56:11 +09:00
198ac1ca3c Merge remote-tracking branch 'origin/develop' into develop 2014-03-28 08:40:03 +01:00
Emil Siverhall
82545c0fa2 moved attachment to mapped superclass to use with both opposition reports and preliminary grading report. 2014-03-28 08:32:28 +01:00
fred-fri
4020eb3b6b renaming the non template entities and some of their attributes 2014-03-28 16:32:25 +09:00
fred-fri
30fdc5d358 renaming projecteventtemplate to activitytemplate, and renaming some atttributes in activityplantemplate 2014-03-28 13:45:31 +09:00
fred-fri
7cf39cd83f renaming everything named scheduletemplate in view to activityplantemplate 2014-03-28 12:58:55 +09:00
fred-fri
adcae9e287 renaming everything named scheduletemplate in core to activityplantemplate 2014-03-28 12:55:37 +09:00
fred-fri
a7b7ea8b89 renamed scheduletemplate attribute in other entities to activityplantemplate 2014-03-28 12:48:26 +09:00
fred-fri
38a0b5ae15 renamed scheduletemplate entity to activityplantemplate 2014-03-28 12:08:01 +09:00
Emil Siverhall
f16ae23cab attachments to opposition report/prel grading report entities 2014-03-27 20:56:48 +01:00
Emil Siverhall
6e55302172 Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 17:18:01 +01:00
Emil Siverhall
73c919994c test 2014-03-27 17:17:49 +01:00
Emil Siverhall
bf18e41a5b different feedback when approving opponents if points could be transferred or not 2014-03-27 17:14:14 +01:00
e20efc80ae Merge remote-tracking branch 'origin/develop' into develop 2014-03-27 16:59:16 +01:00
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
6cd1a7267f Removed a bunch of Spring-related annotations. 2014-03-27 16:42:28 +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