golrokh
|
d6a947a7fa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-01-30 14:41:45 +01:00 |
|
golrokh
|
229e353e77
|
Added confirmation message before delete an activity template
|
2015-01-30 14:41:40 +01:00 |
|
|
|
e937a5c567
|
Tightened the class constraints a bit.
|
2015-01-30 14:12:03 +01:00 |
|
|
|
6439bd2281
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-01-30 14:10:27 +01:00 |
|
|
|
7a0d9ba284
|
Added new activity action "final seminar thesis".
|
2015-01-30 14:10:22 +01:00 |
|
golrokh
|
a1bed485a5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-01-30 14:04:35 +01:00 |
|
golrokh
|
10af8cdc2f
|
Changed Activity's description to Nullable
|
2015-01-30 14:02:22 +01:00 |
|
|
|
65291e70b6
|
Added new activity action "final thesis".
|
2015-01-30 13:57:22 +01:00 |
|
|
|
2c0ff56fa8
|
Added test to make sure the activity plan panel can handle all types of actions.
|
2015-01-30 13:29:17 +01:00 |
|
|
|
0a1b400a5c
|
Removed stupid test.
|
2015-01-30 12:37:46 +01:00 |
|
|
|
a9decef4d1
|
Migrated activity plan templates to support new actions.
|
2015-01-30 10:57:21 +01:00 |
|
|
|
bfec3d7a5a
|
Removed old uploadRequired attribute.
|
2015-01-30 10:43:18 +01:00 |
|
|
|
ef98964cfa
|
Migrated activity plan panel to handle the new actions.
|
2015-01-30 10:19:20 +01:00 |
|
|
|
2d797d133a
|
[SCIPRO-26427] Fixed updating of checklist answers.
Also fixed a few stale models.
|
2015-01-23 12:44:55 +01:00 |
|
|
|
13dd441e45
|
[SCIPRO-26424] Fixed problem when trying to add opponents at the same time as creating the final seminar.
|
2015-01-20 11:32:18 +01:00 |
|
|
|
1df06ae81c
|
Improved AddUsersPanel to not copy/replace the model and instead reflect changes in it.
|
2015-01-20 11:31:00 +01:00 |
|
|
|
86a54668aa
|
Changed ListAdapterModel to be derived from AbstractReadOnlyModel so it does not cache invalid data if the underlying model is changed.
|
2015-01-20 11:29:43 +01:00 |
|
|
|
21958609fa
|
Removed useless page parameter variables.
|
2015-01-20 09:56:07 +01:00 |
|
|
|
0365e74f2e
|
[SCIPRO-26412] Fixed exporting notifications to Excel.
|
2015-01-19 09:38:17 +01:00 |
|
|
|
c7dab120db
|
[SCIPRO-26410] Fixed lazy exception when opening the supervisor profile in interact with supervisor.
|
2015-01-19 09:26:37 +01:00 |
|
|
|
8d6c13bb7a
|
Minor HTML fixes.
|
2015-01-16 14:05:21 +01:00 |
|
|
|
dc6b2b9767
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2015-01-16 13:29:16 +01:00 |
|
|
|
6dfe9dc596
|
Prepare for project delete phase 1 rollback
|
2015-01-16 13:28:57 +01:00 |
|
|
|
04b668b43b
|
Minor CSS cleaning.
|
2015-01-15 16:08:18 +01:00 |
|
|
|
a2d9433893
|
Fixed font on supervisor project details page.
|
2015-01-15 16:05:21 +01:00 |
|
|
|
832f6ccccf
|
Can't mix matchers and non-matchers.
|
2015-01-14 16:16:14 +01:00 |
|
|
|
f2d20d4b2f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-01-14 16:09:00 +01:00 |
|
|
|
985f716660
|
Made the grading report form hide itself when the checkbox is not checked.
|
2015-01-14 16:08:54 +01:00 |
|
|
|
137b2606e6
|
Display grading reports in the reviewer approval process panel.
|
2015-01-14 16:05:12 +01:00 |
|
|
|
71f9a01c77
|
Prepare for project delete phase 1fix
|
2015-01-14 15:49:31 +01:00 |
|
|
|
6a0f7185d2
|
Made it possible to attach a snapshot of the grading report when denying a request.
|
2015-01-14 15:36:23 +01:00 |
|
|
|
37c59cb60e
|
Made it possible to attach a snapshot of the grading report when approving a request.
|
2015-01-14 15:27:43 +01:00 |
|
|
|
f830cb61d0
|
Prepare for project delete phase 1
|
2015-01-14 14:30:41 +01:00 |
|
|
|
71858369c2
|
Moved Scala files to src/main/scala from src/main/java
|
2015-01-14 11:07:58 +01:00 |
|
|
|
c0adfdba3a
|
Fixed CSS warnings.
|
2015-01-13 16:33:50 +01:00 |
|
|
|
9f02c1931b
|
Added descriptive texts in the final seminar approval form.
|
2015-01-13 16:33:10 +01:00 |
|
|
|
269a470568
|
Removed unnecessary unit return value since the warning is turned off now.
|
2015-01-13 15:56:35 +01:00 |
|
|
|
34af437d2e
|
Move HTML file to resources directory. No point keeping it in the Java hierarchy when the code version is Scala.
|
2015-01-13 15:44:31 +01:00 |
|
|
|
b4ba8da169
|
Move Scala file to the src/main/scala hierarchy.
|
2015-01-13 15:43:04 +01:00 |
|
|
|
dcfc1b535d
|
Fixed problem with trying to re-initialize a DataTable when the old one already existing on completed AJAX calls. Now checks that one isn't already present.
|
2015-01-13 14:55:10 +01:00 |
|
|
|
48dd3661e9
|
Fixed placement of the grading in Daisy link on the supervisor grading page.
|
2015-01-13 12:56:15 +01:00 |
|
Andreas Svanberg
|
9786b10384
|
Fixed bug that caused the individual criteria to appear twice in the downloaded grading template.
|
2015-01-12 14:59:51 +01:00 |
|
Andreas Svanberg
|
29a3a2c137
|
Added status and type filter to interact with supervisors page.
|
2015-01-12 08:14:08 +01:00 |
|
Andreas Svanberg
|
0770d526cf
|
Made HTML more readable.
|
2015-01-12 07:20:13 +01:00 |
|
Andreas Svanberg
|
40417699a6
|
Pulled the "Interact with supervisor" tab to the right to indicate that it is separate from the rest.
|
2015-01-12 07:18:16 +01:00 |
|
Andreas Svanberg
|
9079c51009
|
Made links to Daisy grading and TurnItIn analysis open in new windows.
|
2015-01-12 07:16:23 +01:00 |
|
Andreas Svanberg
|
cec1ac5a1d
|
Converted interact with supervisor to javascript-based sorting to enable sorting on "unread posts".
|
2015-01-12 07:11:11 +01:00 |
|
|
|
bdaf1ff990
|
Changed link text on the link to Daisy grading.
|
2015-01-09 15:23:06 +01:00 |
|
|
|
fddf51db4b
|
Changed to JavaConversions when doing the conversion on the Java side of things.
|
2015-01-07 07:04:43 +01:00 |
|
|
|
191469ce0f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-19 21:46:50 +01:00 |
|
