|
|
3090e53bfe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-23 15:52:33 +01:00 |
|
|
|
248378736c
|
DROP TABLE ReviewerApproval_Decision fix2
|
2015-03-23 15:25:51 +01:00 |
|
|
|
934e25396f
|
Merge branch 'develop' into user_profile
|
2015-03-23 15:09:15 +01:00 |
|
|
|
3a8f737352
|
Made the uploaded profile picture show.
|
2015-03-23 15:08:51 +01:00 |
|
|
|
546570e1ed
|
Version conflict.
|
2015-03-23 14:06:42 +01:00 |
|
|
|
836dac027b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-23 14:01:59 +01:00 |
|
|
|
5a31c84ba4
|
Merge branch 'develop' into user_profile
|
2015-03-23 14:01:37 +01:00 |
|
|
|
873d2404ad
|
DROP TABLE ReviewerApproval_Decision fix
|
2015-03-23 14:01:36 +01:00 |
|
|
|
75045da129
|
'' apparently prevents argument substitution.
|
2015-03-23 13:58:52 +01:00 |
|
|
|
65814a5bd1
|
More toString madness.
|
2015-03-23 13:56:05 +01:00 |
|
|
|
8daad4a215
|
Changed so that first meeting reminders only go out to completed ideas.
|
2015-03-23 13:22:31 +01:00 |
|
|
|
e3da86467a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-23 13:18:56 +01:00 |
|
|
|
39701479cf
|
Fixed typo
|
2015-03-23 13:18:52 +01:00 |
|
|
|
b8a8e888c0
|
DROP TABLE ReviewerApproval_Decision
|
2015-03-23 13:09:13 +01:00 |
|
|
|
4f08e89915
|
Added more choices for profile image.
|
2015-03-23 10:16:26 +01:00 |
|
|
|
61c0fbf3b7
|
Included comment in the reviewer support mail that goes out when a request is made for a project without reviewer.
|
2015-03-20 15:27:46 +01:00 |
|
|
|
fb88667e3f
|
Added authors to the reviewer support mail when an approval is requested.
|
2015-03-20 14:55:09 +01:00 |
|
|
|
af6ddad4d8
|
Changed project details dialog for authors to a separate page.
|
2015-03-20 12:53:19 +01:00 |
|
|
|
481b2a4087
|
De-Lomboked some getters.
|
2015-03-20 09:35:55 +01:00 |
|
|
|
8674594f02
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-20 09:34:08 +01:00 |
|
|
|
b1e9bf3afb
|
GRU is now added as BCC to first meeting reminder that goes out on course start.
|
2015-03-20 09:33:57 +01:00 |
|
golrokh
|
a424efca9b
|
Added Research area to Project, now supervisor may specify the research area in sending request approvals to reviewer
|
2015-03-19 17:59:28 +01:00 |
|
|
|
b9b9531f1a
|
More TODO stuff.
|
2015-03-19 12:10:35 +01:00 |
|
|
|
6947b9e90b
|
Attempt at reducing complexity by removing unnecessary checks and re-using previous ones.
|
2015-03-19 12:04:40 +01:00 |
|
|
|
f75e68ddcd
|
Removed "Mark all read" from the project and group forums.
|
2015-03-19 10:49:41 +01:00 |
|
|
|
af72116811
|
Removed partner confirmation from the match system.
|
2015-03-19 10:33:39 +01:00 |
|
|
|
60747fc1c1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-19 08:32:12 +01:00 |
|
|
|
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 |
|
