|
|
37b76915c0
|
Removed toggling of project/group details.
|
2015-03-19 08:32:06 +01:00 |
|
golrokh
|
db42061735
|
Changed reviewer support mail address to optional
|
2015-03-19 08:23:52 +01:00 |
|
golrokh
|
4880f48adf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 16:25:24 +01:00 |
|
golrokh
|
7c076e39a1
|
Added a separated class for sending mail to reviewer support
|
2015-03-18 16:24:57 +01:00 |
|
|
|
c40a818aa1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 16:17:06 +01:00 |
|
|
|
4d9d56e97e
|
Added better feedback when a reviewer tries to move the final grading report to the next step and some criteria have not been assessed.
|
2015-03-18 16:17:02 +01:00 |
|
golrokh
|
19e44f5950
|
Fixed tests
|
2015-03-18 15:19:21 +01:00 |
|
golrokh
|
909466ba72
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 14:42:43 +01:00 |
|
golrokh
|
c4b89863b6
|
Added a feature for sending email to ReviewerSupport after requesting for reviewer approval for both rough draft and final seminar.
|
2015-03-18 14:42:37 +01:00 |
|
|
|
a48137646e
|
Added a general system setting for thesis support e-mail address.
|
2015-03-18 13:34:46 +01:00 |
|
golrokh
|
4886426b8d
|
Removed hard coded email address for reviewer support
|
2015-03-18 13:24:56 +01:00 |
|
|
|
f552667ce0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 13:24:21 +01:00 |
|
golrokh
|
fc0e5c310c
|
Added "reviewer-support" email to the General settings
|
2015-03-18 13:20:17 +01:00 |
|
|
|
b6338f2eeb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 13:20:01 +01:00 |
|
|
|
eb2521ed36
|
Removed useless class.
|
2015-03-18 13:02:56 +01:00 |
|
|
|
969209f545
|
Added a "mail recipient" abstraction so we can combine user and non-user recipients in Admin / Mail / Compose.
|
2015-03-18 12:53:57 +01:00 |
|
golrokh
|
4c8f4b48b6
|
Merge branch 'AdminPeerStatistics' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/AdminPeerListPage.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
|
2015-03-18 11:02:36 +01:00 |
|
golrokh
|
ee9586f58a
|
Better detail on statistic , showing filter area, adding checklists and answers in statistics
|
2015-03-18 11:00:19 +01:00 |
|
|
|
3553417aef
|
Removed all this ridiculous global mutable state.
|
2015-03-18 09:24:28 +01:00 |
|
golrokh
|
4b43d856e6
|
Merge conflicts
|
2015-03-17 15:53:12 +01:00 |
|
|
|
11f18daad9
|
Reduced visibility.
|
2015-03-17 15:46:56 +01:00 |
|
golrokh
|
db0f722083
|
Merge remote-tracking branch 'origin/AdminPeerStatistics' into AdminPeerStatistics
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java
view/src/main/java/se/su/dsv/scipro/peer/AdminPeersPage.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewListPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewListPanel.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.java
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanel.properties
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.html
view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/peer/SupervisorPeersPage.java
view/src/test/java/se/su/dsv/scipro/peer/PeerReviewStatisticPanelTest.java
|
2015-03-17 15:37:15 +01:00 |
|
golrokh
|
e5f1130717
|
Added statistics and statistic detail for both supervisor and admin peer review statistics
|
2015-03-17 15:10:53 +01:00 |
|
|
|
1af23db49f
|
Project types now have a flag to indicate whether the projects are reviewed or not.
Interact with reviewer tab is now shown/hidden based on the reviewed flag for the projects type.
|
2015-03-17 12:57:35 +01:00 |
|
|
|
f7271305d2
|
Include time in the date field for final seminar notifications.
|
2015-03-17 12:36:55 +01:00 |
|
|
|
9055542138
|
Added match responsible e-mail to units.
|
2015-03-17 11:18:33 +01:00 |
|
|
|
aa173ae484
|
I don't get why Wicket tries to toString everything all the time.
|
2015-03-05 17:05:19 +01:00 |
|
|
|
c6998a314b
|
[SCIPRO-26819] Oh Hibernate...
|
2015-03-05 10:59:19 +01:00 |
|
|
|
4e83721923
|
Fixed error in notification compilation mail.
|
2015-03-02 13:04:44 +01:00 |
|
golrokh
|
dd2782205d
|
Merge remote-tracking branch 'origin/develop' into AdminPeerStatistics
|
2015-02-27 11:03:19 +01:00 |
|
golrokh
|
44507e3c89
|
Made Status clickable and lead to List page in Admin PeerReview Statistic
|
2015-02-27 11:02:23 +01:00 |
|
golrokh
|
9ab30c5bb1
|
Added Statistic Area that shows number of peer reviews in total and also for every peerReviewStatus
|
2015-02-26 15:51:00 +01:00 |
|
|
|
d68d2bd3f4
|
Fixed cyclic dependency by making the notifications for expired peer requests event based.
|
2015-02-26 15:00:45 +01:00 |
|
|
|
9b407c2cd3
|
Fixed proper cascades for notification events to get rid of cyclic dependencies.
|
2015-02-26 14:55:20 +01:00 |
|
|
|
d7de4794ab
|
Fixed a lot of cyclic dependencies.
|
2015-02-26 14:38:55 +01:00 |
|
|
|
da4f8bbc9f
|
Adding a template as a plan and creating a template from a plan now uses work days rather than calendar days.
|
2015-02-26 10:27:32 +01:00 |
|
|
|
8e399008b5
|
Created a panel to preview an activity plan template.
|
2015-02-26 09:54:25 +01:00 |
|
|
|
d67285315c
|
Fixed bug when calculating work days ahead.
|
2015-02-26 09:53:41 +01:00 |
|
golrokh
|
5c9b2ef1fa
|
Made 'grading completeg' milestone as completed when supervisor set kursbetyg in daisy
|
2015-02-25 14:39:43 +01:00 |
|
|
|
6188cbda64
|
Fixed problem when Turnitin upload fails for the first time.
|
2015-02-24 14:40:21 +01:00 |
|
|
|
c643d593e0
|
Fixed migration script.
|
2015-02-23 15:54:18 +01:00 |
|
|
|
c287bebb94
|
Removed unused ForumPost field from GroupEvent and ProjectForumEvent
|
2015-02-23 15:20:01 +01:00 |
|
|
|
c4c77a0f12
|
Stupid IntelliJ converting to deprecated procedure syntax.
|
2015-02-23 15:12:24 +01:00 |
|
|
|
22d4921140
|
Fixed a bug from previous implementation of marking notifications read that caused the entire forum to be read when reading a single thread.
|
2015-02-23 15:06:57 +01:00 |
|
|
|
48f6ed982b
|
Made it so reading a forum post now always mark the related notification(s) as read.
|
2015-02-23 15:01:34 +01:00 |
|
|
|
0e77a2d110
|
When reading a forum post an event goes out to indicate that a user just read a post.
|
2015-02-23 13:26:53 +01:00 |
|
|
|
4ef655133b
|
Made (some) of the notification controllers method return the notifications they generated.
|
2015-02-23 13:10:10 +01:00 |
|
|
|
504e664c83
|
Fixed test.
|
2015-02-23 09:52:35 +01:00 |
|
|
|
56e1668637
|
Fixed filtering over for who receives forum mail (was reverse of the setting).
|
2015-02-23 08:16:53 +01:00 |
|
Andreas Svanberg
|
46d5751ff9
|
Removed unused method.
|
2015-02-20 21:57:19 +01:00 |
|
