Leo
|
abc24cbcb2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 16:26:44 +01:00 |
|
Leo
|
a640918624
|
fixed broken tests
|
2013-12-05 16:26:25 +01:00 |
|
Richard
|
e31da653bc
|
Changed info-text on FillOutGradingReportPanel.html
|
2013-12-05 16:13:21 +01:00 |
|
Leo
|
148816ef10
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 16:12:37 +01:00 |
|
Richard
|
abbf1abfe0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 16:10:25 +01:00 |
|
Richard
|
96bf276cf0
|
Fixed problems with sneaky sneak.
|
2013-12-05 16:10:14 +01:00 |
|
Emil Siverhall
|
132c802476
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 14:43:42 +01:00 |
|
Emil Siverhall
|
8750a2940b
|
made sure we actually save the date when updating a cancelled seminar time
|
2013-12-05 14:34:22 +01:00 |
|
Leo
|
f7bff97274
|
new naming for .pdf's downloaded from FillOutGradingReportPanel
|
2013-12-05 13:53:53 +01:00 |
|
Emil Siverhall
|
c11d572390
|
renamed some logging/labels in thesis upload deadline worker from delete to cancel since this is what we show the users.
|
2013-12-05 11:53:09 +01:00 |
|
Leo
|
48604213b8
|
shows total points
|
2013-12-05 11:46:35 +01:00 |
|
Emil Siverhall
|
c5fc7069e8
|
allow update of final seminar date even if original date has passed in the case were seminar has been cancelled
|
2013-12-05 11:39:39 +01:00 |
|
Leo
|
f2407d4ade
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 10:37:23 +01:00 |
|
Leo
|
25b7724fe5
|
fixed a clumsy error with the tabs
|
2013-12-05 10:35:32 +01:00 |
|
fred-fri
|
c1cd91af87
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-05 17:49:18 +09:00 |
|
Leo
|
1d968b1a16
|
removed unnecessary javascript and listener, fixed a test
|
2013-12-05 09:47:56 +01:00 |
|
fred-fri
|
8df633b8d9
|
fix
|
2013-12-05 17:41:12 +09:00 |
|
Leo
|
11085b9e26
|
tabs now work again, while still saving
|
2013-12-05 09:27:37 +01:00 |
|
Leo
|
1c5de42847
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-05 09:14:32 +01:00 |
|
Leo
|
39a68f5f90
|
removed unused method
|
2013-12-05 09:14:23 +01:00 |
|
fred-fri
|
8cc851b349
|
fix
|
2013-12-05 17:10:02 +09:00 |
|
fred-fri
|
b4cf25ce2b
|
fix
|
2013-12-05 17:00:24 +09:00 |
|
fred-fri
|
4e552d9a95
|
removed unused stuff
|
2013-12-05 16:49:26 +09:00 |
|
fred-fri
|
2e6562bb59
|
removed externalsupervisorinfo from idea
|
2013-12-05 16:47:20 +09:00 |
|
fred-fri
|
38da7e553a
|
cleanup
|
2013-12-05 16:45:51 +09:00 |
|
fred-fri
|
4148c4ffa3
|
cleanup
|
2013-12-05 15:55:26 +09:00 |
|
fred-fri
|
9eaa0c197e
|
fixing tests... verify can only be used on mocks
|
2013-12-05 15:29:35 +09:00 |
|
fred-fri
|
8230da89fc
|
hooked up new addmatch method to partner confirmation
|
2013-12-05 15:09:22 +09:00 |
|
fred-fri
|
7b4300ffaa
|
hooked up new addmatch method to change supervisor
|
2013-12-05 14:52:45 +09:00 |
|
fred-fri
|
6103ef230f
|
hooked up new addmatch method to create project
|
2013-12-05 14:51:24 +09:00 |
|
fred-fri
|
369100e47c
|
hooked up new addmatch method to save student idea
|
2013-12-05 14:48:58 +09:00 |
|
fred-fri
|
3d50b94551
|
hooked up new addmatch method to savesupervisoridea
|
2013-12-05 14:26:02 +09:00 |
|
fred-fri
|
5dffc03fcb
|
removed unused addnewmatch method with source
|
2013-12-05 14:19:32 +09:00 |
|
fred-fri
|
29deae45bb
|
hooked up new addmatch method to admin unmatch matched student idea
|
2013-12-05 14:17:24 +09:00 |
|
fred-fri
|
21034ef842
|
hooked up new addmatch method to supervisor select student idea
|
2013-12-05 14:14:27 +09:00 |
|
fred-fri
|
b7ddcb442d
|
hooked up new addmatch method to admin removal of students
|
2013-12-05 13:52:59 +09:00 |
|
fred-fri
|
442145a3a2
|
hooked up student accept of supervisor idea to new addmatch method
|
2013-12-05 12:42:22 +09:00 |
|
fred-fri
|
28772990d8
|
added addmatch method
|
2013-12-05 12:05:23 +09:00 |
|
fred-fri
|
118d355560
|
added addmatch method
|
2013-12-05 11:58:57 +09:00 |
|
|
|
717ae57c0b
|
Attempt at fixing broken tabs.
|
2013-12-04 17:23:02 +01:00 |
|
|
|
7e1f1c0f96
|
Fixed double feedback.
|
2013-12-04 17:19:40 +01:00 |
|
|
|
82deeff0d5
|
Refactored FillOutGradingReportPanel so that it saves all the report when clicking on a tab.
|
2013-12-04 16:52:08 +01:00 |
|
|
|
6de66d5ac3
|
Clean up around grading report and made sure no one can modify it.
|
2013-12-04 15:59:40 +01:00 |
|
|
|
3a9a163118
|
Added grade label to grading report panel.
|
2013-12-04 15:14:19 +01:00 |
|
|
|
4990683768
|
Removed stupid code.
|
2013-12-04 14:59:45 +01:00 |
|
|
|
0de9342880
|
Removed dead code.
|
2013-12-04 14:57:19 +01:00 |
|
|
|
938a6c6cee
|
Changed test to not randomly failed if test execution takes too long.
|
2013-12-04 14:52:11 +01:00 |
|
|
|
e0e2e7fe06
|
Automatic grading now handles Fx as well.
|
2013-12-04 14:47:51 +01:00 |
|
|
|
a53e123630
|
Split grading criterion into two types (individual and project).
|
2013-12-04 13:53:12 +01:00 |
|
|
|
c6cc29d3a3
|
Split grading criterion templates into two types (individual and project).
|
2013-12-04 13:46:18 +01:00 |
|
