Richard
|
a8b1db15fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 09:00:44 +01:00 |
|
Emil Siverhall
|
15d3176fe5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 08:58:47 +01:00 |
|
Emil Siverhall
|
c994e7db47
|
date format change on peer tables
|
2013-11-15 08:58:16 +01:00 |
|
fred-fri
|
ef8520c0b2
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:48:52 +09:00 |
|
fred-fri
|
a5143e16bf
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:39:18 +09:00 |
|
fred-fri
|
060ca7edd4
|
refactored a method
|
2013-11-15 15:03:33 +09:00 |
|
fred-fri
|
08827a0a41
|
Merge branch 'per' into develop
|
2013-11-15 11:05:01 +09:00 |
|
Per Lundholm
|
95422c5f12
|
Method storeForumFile made private part of ForumService
|
2013-11-14 17:10:14 +01:00 |
|
Emil Siverhall
|
70346b6cf7
|
changed grading report text resource test to go with locale changes
|
2013-11-14 16:43:45 +01:00 |
|
Emil Siverhall
|
9e577d710c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:36:14 +01:00 |
|
Emil Siverhall
|
832d781946
|
changed turnitinsettingspagetest to fit new datetextfield
|
2013-11-14 16:35:56 +01:00 |
|
niklas3
|
89ac27e49f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:34:42 +01:00 |
|
|
|
6dd12e01ae
|
Fixed test to use proper date formatting.
|
2013-11-14 16:33:36 +01:00 |
|
Emil Siverhall
|
3b058447c0
|
changed datefield on turnitin settings page
|
2013-11-14 16:22:51 +01:00 |
|
|
|
cb904e9bc5
|
Changed to English locale and updated StylableDateTimeField to use system wide date-format settings and 24-hour format.
|
2013-11-14 16:21:14 +01:00 |
|
|
|
e1d4a847b3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:07:49 +01:00 |
|
niklas3
|
fc761ed351
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:03:16 +01:00 |
|
niklas3
|
737de64995
|
fix'd
|
2013-11-14 16:02:57 +01:00 |
|
|
|
a4cd8ab3ff
|
Guarded against null since the component is an ajax fallback link.
|
2013-11-14 15:53:38 +01:00 |
|
Emil Siverhall
|
d123c82b07
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-14 15:49:29 +01:00 |
|
Emil Siverhall
|
86604e5777
|
make sure download of grading report txt works even without reviewer on the project
|
2013-11-14 15:49:21 +01:00 |
|
|
|
abb0abaf4d
|
Removed unused private fields.
|
2013-11-14 15:29:09 +01:00 |
|
Emil Siverhall
|
b5b4435627
|
removed unused constructor parameter
|
2013-11-14 14:53:34 +01:00 |
|
Emil Siverhall
|
21ee2dfa4d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 14:42:02 +01:00 |
|
Emil Siverhall
|
f9976bce95
|
fixed test failure
|
2013-11-14 14:41:49 +01:00 |
|
|
|
be608a0e35
|
More logging from workers.
|
2013-11-14 14:35:59 +01:00 |
|
Emil Siverhall
|
68cfe1a5d6
|
maileventworkers logger logs the actual exception when unable to send mail
|
2013-11-14 14:19:16 +01:00 |
|
Emil Siverhall
|
f4456599a0
|
mocking GradingReportService
|
2013-11-14 14:09:40 +01:00 |
|
|
|
0047cd4be5
|
Force JBoss (Hibernate) to use SLF4J.
|
2013-11-14 14:04:27 +01:00 |
|
Richard
|
667147c2c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 13:57:56 +01:00 |
|
|
|
944faf3815
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 13:44:48 +01:00 |
|
|
|
1568581add
|
Removed duplicate final thesis panel in supervisor project view.
|
2013-11-14 13:44:44 +01:00 |
|
Emil Siverhall
|
e9377dae99
|
supervisors is not allowed to see the grading tab if the projects project class doesn't have a grading report template
|
2013-11-14 13:40:22 +01:00 |
|
Richard
|
f7021b3ede
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 13:09:43 +01:00 |
|
Richard
|
61b36bff4b
|
HTML changes to the activity plan templates panels and the activity plan panel.
|
2013-11-14 13:09:31 +01:00 |
|
|
|
d9457d0c3e
|
Removed UserSettings.
|
2013-11-14 13:01:17 +01:00 |
|
Emil Siverhall
|
996919f1fe
|
added grading report export object to check if a grading report has been exported to daisy
|
2013-11-14 11:15:41 +01:00 |
|
niklas3
|
af63f3a134
|
pushing
|
2013-11-14 10:37:19 +01:00 |
|
niklas3
|
4b9b6ebec6
|
Fixd refactoring fail
|
2013-11-14 10:30:47 +01:00 |
|
|
|
c37efd5d0b
|
Added final thesis panel to supervisor project details page.
|
2013-11-14 10:11:14 +01:00 |
|
Richard
|
96be2755f4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 09:46:30 +01:00 |
|
fred-fri
|
47a7d1819e
|
hiding
|
2013-11-14 12:02:40 +09:00 |
|
niklas3
|
ac8f5f574d
|
Project now has an extended Builder.
|
2013-11-13 17:37:57 +01:00 |
|
Richard
|
705167b234
|
Started to style final thesis panels.
|
2013-11-13 17:30:32 +01:00 |
|
niklas3
|
c374eae818
|
fixed up some visibility logic
|
2013-11-13 16:30:34 +01:00 |
|
niklas3
|
4647163491
|
More approved thesis info
|
2013-11-13 14:40:12 +01:00 |
|
niklas3
|
7c4e0b9705
|
Tests the correctness of the final thesis file name.
|
2013-11-13 14:22:59 +01:00 |
|
niklas3
|
d8e2cb4ec4
|
Added ApprovedPanel and RevisionPanel to FinalThesisPanel.
|
2013-11-13 13:59:21 +01:00 |
|
niklas3
|
63fdc78eaa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-13 13:12:49 +01:00 |
|
niklas3
|
c969d0c4c6
|
Clean up in aisle 4.
|
2013-11-13 13:12:41 +01:00 |
|
