|
|
638ac47b34
|
Removed year from annual review.
|
2014-05-06 15:15:22 +02:00 |
|
Emil Siverhall
|
b4eeaae44c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 14:45:42 +02:00 |
|
Emil Siverhall
|
b7a204b084
|
step column to approval table
|
2014-05-06 14:44:49 +02:00 |
|
|
|
af4f1964f9
|
Removed ThesisCommentPunishWorker (it does not work currently)
|
2014-05-06 14:31:40 +02:00 |
|
|
|
0de3c1bae6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 14:10:55 +02:00 |
|
|
|
6ecbcb80f7
|
Why do all classes created by IDEA land in the generated-sources directory...............
|
2014-05-06 14:10:51 +02:00 |
|
Emil Siverhall
|
a7b0cbe1ae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 14:08:40 +02:00 |
|
Emil Siverhall
|
719ca6557b
|
test fix + tab label
|
2014-05-06 14:08:30 +02:00 |
|
|
|
e15c9fc446
|
Notifications are now sent out to the supervisor when the reviewer makes a decision.
|
2014-05-06 14:08:18 +02:00 |
|
|
|
f537ca3d4a
|
Cosmetic changes.
|
2014-05-06 13:46:05 +02:00 |
|
|
|
6900301309
|
Changed notification for approval requests to be more generic.
|
2014-05-06 13:42:05 +02:00 |
|
Emil Siverhall
|
b3be30b3d1
|
rought draft approval working
|
2014-05-06 13:36:56 +02:00 |
|
Emil Siverhall
|
451ff0d503
|
refactoring
|
2014-05-06 12:45:28 +02:00 |
|
Emil Siverhall
|
e2a1d3830b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 12:35:09 +02:00 |
|
|
|
238c40772c
|
Added missing class.
|
2014-05-06 12:35:53 +02:00 |
|
|
|
b5aa110899
|
Attempt at fixing automatic migrations.
|
2014-05-06 12:31:21 +02:00 |
|
Emil Siverhall
|
82b0fc6d7f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 12:31:13 +02:00 |
|
|
|
67dfb3d6b5
|
Added notification when a request for final seminar approval is added.
|
2014-05-06 12:28:28 +02:00 |
|
|
|
3f3df67e9e
|
Revert "Fixed some more cycles."
This reverts commit 5317064016fbf17a3b05241ade4393a8737dae1f.
|
2014-05-06 10:09:02 +02:00 |
|
|
|
5317064016
|
Fixed some more cycles.
|
2014-05-06 09:56:11 +02:00 |
|
|
|
d31723da8f
|
Moved Pair class to util package.
|
2014-05-06 09:50:19 +02:00 |
|
Emil Siverhall
|
231aac5fd6
|
approval superclass with new rought draft approval subclass
|
2014-05-05 14:49:01 +02:00 |
|
|
|
6bad58f4ea
|
Now shows all final seminar approvals instead of only undecided.
|
2014-05-05 14:33:02 +02:00 |
|
Emil Siverhall
|
811850f5d2
|
latest events panel only take forum threads in consideration
|
2014-05-05 13:41:13 +02:00 |
|
|
|
026518a2d4
|
Added more tests.
|
2014-05-02 10:08:43 +02:00 |
|
|
|
0542a2f82e
|
Supervisor can now upload a new version if the old one is rejected in the final seminar approval step.
|
2014-05-02 10:02:54 +02:00 |
|
|
|
0eb985cd24
|
Implemented ReviewerDecisionService.
|
2014-05-02 09:29:35 +02:00 |
|
|
|
50a9bb0d5d
|
Added the ability to approve final seminar approvals by the reviewer.
|
2014-05-02 09:11:46 +02:00 |
|
|
|
062653d43d
|
Added the ability to reject final seminar approvals by the reviewer.
|
2014-05-02 08:37:50 +02:00 |
|
fred-fri
|
21a9541ad6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-01 15:31:20 +09:00 |
|
fred-fri
|
c2512fc67a
|
hard coded description in property file
|
2014-05-01 15:30:58 +09:00 |
|
|
|
5867d72e56
|
Added table with undecided FinalSeminarApprovals to the reviewing page.
|
2014-04-30 15:21:12 +02:00 |
|
fred-fri
|
26a0d93cfe
|
removing edit description stuff
|
2014-04-30 15:42:56 +09:00 |
|
Emil Siverhall
|
0713b85636
|
issues
|
2014-04-30 08:06:31 +02:00 |
|
Emil Siverhall
|
54de6ab54d
|
renamed migration scripts and some minor changes
|
2014-04-29 22:46:47 +02:00 |
|
Emil Siverhall
|
f3b48c6bae
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.html
|
2014-04-29 22:23:10 +02:00 |
|
Emil Siverhall
|
1ab425cb59
|
do not notify if not forum thread being replied to
|
2014-04-29 16:45:42 +02:00 |
|
|
|
4cc659f711
|
Minor fixes.
|
2014-04-29 16:21:58 +02:00 |
|
|
|
38acc9e225
|
Implemented FinalSeminarApprovalService.
|
2014-04-29 16:17:42 +02:00 |
|
|
|
aa66690fb3
|
Panel to show the current ongoing process for approving final seminars.
|
2014-04-29 15:29:52 +02:00 |
|
Emil Siverhall
|
af13350b8b
|
interaction page for reviewers
|
2014-04-29 14:56:40 +02:00 |
|
|
|
4431eef165
|
Panel for the supervisor to initiate the final seminar approval process.
|
2014-04-29 14:09:52 +02:00 |
|
|
|
f7626c7e1a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-29 13:08:03 +02:00 |
|
Emil Siverhall
|
6bcb331de2
|
renamed migration scripts and merged reviewer interaction page content
|
2014-04-29 12:19:51 +02:00 |
|
|
|
e4d35e202e
|
Created new model for making decisions if final seminar is allowed.
|
2014-04-29 11:34:47 +02:00 |
|
Emil Siverhall
|
4cc4bbe4ea
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/modules/RepositoryModule.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
view/src/test/java/se/su/dsv/scipro/SciProTest.java
|
2014-04-29 11:31:01 +02:00 |
|
fred-fri
|
3bc95f1f39
|
added reviewer stuff
|
2014-04-29 17:48:01 +09:00 |
|
Emil Siverhall
|
6ea1a5e6b9
|
unthreaded forum shouldn't show reviewer interaction threads
|
2014-04-29 09:29:53 +02:00 |
|
Emil Siverhall
|
032bf9a19e
|
test tweaking
|
2014-04-29 08:33:50 +02:00 |
|
fred-fri
|
85b863e380
|
adding draft to project (simplest possible solution)
|
2014-04-29 14:21:44 +09:00 |
|
