|
|
b6338f2eeb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-03-18 13:20:01 +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 |
|
golrokh
|
4b43d856e6
|
Merge conflicts
|
2015-03-17 15:53:12 +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 |
|
|
|
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 |
|
|
|
86feaa01ab
|
[SCIPRO-26909] Fixed crash when adding application period exemptions.
|
2015-03-05 11:16:01 +01:00 |
|
|
|
ffb644dd0b
|
Shitty Wicket that doesn't work.
|
2015-03-05 10:37:40 +01:00 |
|
|
|
00ca319dea
|
Stop using toString for display purposes.
|
2015-03-05 09:31:12 +01:00 |
|
golrokh
|
f5440cc079
|
Deleted COP files
|
2015-03-02 14:13:23 +01:00 |
|
|
|
4e83721923
|
Fixed error in notification compilation mail.
|
2015-03-02 13:04:44 +01:00 |
|
golrokh
|
ed6b0eb0cb
|
Revert "Deleted statistics over the admin/statistic/peer review page"
This reverts commit e5be9171a8e12853886d487fde01d3c5992893f6.
|
2015-02-27 16:18:25 +01:00 |
|
golrokh
|
4c6d3684a4
|
Revert "Removed unnecessary form and Fixed the code to work without Form. Removed Status filter. Change Language filter label. Set default filter. The last 6 months as default for the Date duration & Master/Bachelor as default for the project type filter."
This reverts commit da09f9a6eec75f3386241f1af3771fd334a326d4.
|
2015-02-27 16:18:11 +01:00 |
|
golrokh
|
99cafdc272
|
Change texts
|
2015-02-27 15:44:41 +01:00 |
|
golrokh
|
2df3aa312e
|
Changed UI s
|
2015-02-27 14:59:22 +01:00 |
|
golrokh
|
b5565b31c6
|
Changed UI s
|
2015-02-27 14:56:26 +01:00 |
|
golrokh
|
75463c08a7
|
Merge branch 'develop' into AdminPeerStatistics
|
2015-02-27 11:15:48 +01:00 |
|
golrokh
|
bf7e3fa4d2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-27 11:15:19 +01:00 |
|
golrokh
|
bcfece9fa2
|
Fixed problem with project title in Admin, Statistics, PeerRequests
|
2015-02-27 11:15:14 +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 |
|
|
|
a146400527
|
Preview now updates when adding a new activity.
|
2015-02-27 09:33:09 +01:00 |
|
golrokh
|
6c629d680e
|
Flipped green & red buttons in reviewer approval decision page.
|
2015-02-27 09:23:14 +01:00 |
|
golrokh
|
e2d0529341
|
using info-text and well class to have the page as same as files & activity plan
|
2015-02-27 09:15:56 +01:00 |
|
golrokh
|
5d630bf50b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-26 15:52:16 +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 |
|
|
|
6478c8dd36
|
Fixed some styling problems.
|
2015-02-26 14:43:39 +01:00 |
|
golrokh
|
da09f9a6ee
|
Removed unnecessary form and Fixed the code to work without Form. Removed Status filter. Change Language filter label. Set default filter. The last 6 months as default for the Date duration & Master/Bachelor as default for the project type filter.
|
2015-02-26 14:02:55 +01:00 |
|
golrokh
|
e5be9171a8
|
Deleted statistics over the admin/statistic/peer review page
|
2015-02-26 12:32:01 +01:00 |
|
golrokh
|
8bc6772dd1
|
fixed tests
|
2015-02-26 12:06:28 +01:00 |
|
golrokh
|
a8ec091357
|
Changed _ to .
|
2015-02-26 11:32:58 +01:00 |
|
|
|
7dfe568fbd
|
Changed text in reviewer approvals.
EnumLabel galore.
|
2015-02-26 11:21:11 +01:00 |
|
golrokh
|
4b78574bd1
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2015-02-26 10:54:26 +01:00 |
|
golrokh
|
ec85ea0b0b
|
Added info text above supervisor and student forums
|
2015-02-26 10:37:01 +01:00 |
|
|
|
b1fdd00496
|
Fixed test.
|
2015-02-26 10:36:50 +01:00 |
|
|
|
0df2052242
|
Fixed so that admins can change local users password.
|
2015-02-26 10:31:42 +01:00 |
|
|
|
97b97ecdb1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-02-26 10:28:03 +01:00 |
|
|
|
bf1249c03d
|
Added the ability to change start date in the activity plan template preview.
|
2015-02-26 10:16:48 +01:00 |
|
