golrokh
|
0ea5e5655d
|
Changed time to 08:00 when creating an activity plan from template
|
2015-03-19 09:31:24 +01:00 |
|
golrokh
|
656c262b71
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-19 09:06:24 +01:00 |
|
golrokh
|
590db5eea6
|
Added info text for activity plan
|
2015-03-19 09:06:12 +01:00 |
|
|
|
fb8a1cf1b2
|
Removed a bunch of useless tests.
|
2015-03-19 08:45:48 +01:00 |
|
|
|
31d60b2191
|
Fixed tests.
|
2015-03-19 08:44:31 +01:00 |
|
|
|
85f3d4e9d2
|
Fixed tests.
|
2015-03-19 08:41:43 +01:00 |
|
|
|
3353c0f8ca
|
Fixed tests.
|
2015-03-19 08:39:50 +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
|
0921116fdb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-19 08:23:58 +01:00 |
|
golrokh
|
db42061735
|
Changed reviewer support mail address to optional
|
2015-03-19 08:23:52 +01:00 |
|
|
|
6262af7fe0
|
Removed edit icons from project and group details/header panels.
|
2015-03-19 08:15:20 +01:00 |
|
|
|
58e1b7ee91
|
Added match responsible column to unit table in admin interface.
|
2015-03-18 16:55:35 +01:00 |
|
|
|
246c8aae06
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 16:35:25 +01:00 |
|
|
|
1588a015b5
|
Moved "Non work days" under "Project Management" from "System".
|
2015-03-18 16:35:20 +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
|
bd46caa0c2
|
Fixed tests
|
2015-03-18 14:55:09 +01:00 |
|
golrokh
|
65cbd8312b
|
Added validator to the reviewer mail address
|
2015-03-18 14:48:54 +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 |
|
|
|
35f4fd2c14
|
Cleaning.
|
2015-03-18 12:57:06 +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 |
|
|
|
7a01f8b40d
|
Fixed tests.
|
2015-03-17 13:28:55 +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 |
|
|
|
874326e718
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-17 11:18:39 +01:00 |
|
|
|
9055542138
|
Added match responsible e-mail to units.
|
2015-03-17 11:18:33 +01:00 |
|
|
|
62c001379c
|
Fix reviewer deadlines page
|
2015-03-17 11:12:05 +01:00 |
|
|
|
d9444bee71
|
Added a table to Admin / System / Notification settings / General settings describing all non-notification mails that are sent by the system.
|
2015-03-17 09:56:00 +01:00 |
|
|
|
d4310967f5
|
Fixed JavaScript problems when the Wicket object is not defined (because there are no Wicket AJAX components).
|
2015-03-16 17:01:36 +01:00 |
|
|
|
f610684612
|
Fixed problem with viewing project partners and due to using User#toString.
|
2015-03-16 16:43:43 +01:00 |
|
|
|
336c8b784a
|
Create new idea move checkbox to right
|
2015-03-16 15:38:05 +01:00 |
|
|
|
aa173ae484
|
I don't get why Wicket tries to toString everything all the time.
release-83
|
2015-03-05 17:05:19 +01:00 |
|
