6467 Commits

Author SHA1 Message Date
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
dfac8847dc Of course a stateful copy of the activity templates are kept in memory so we can't preview an activity plan, only a List<ActivityTemplates>. 2015-02-26 10:08:01 +01:00
cd1d11fac7 Improved HTML. 2015-02-26 09:57:33 +01:00
8e399008b5 Created a panel to preview an activity plan template. 2015-02-26 09:54:25 +01:00
golrokh
bff292efe5 minor changes for better code 2015-02-26 09:45:01 +01:00
cf5efcb54b Seriously stop using toString for presentation purposes. 2015-02-25 15:32:18 +01:00
af4a8a7ac5 Only admin role (instead of sysadmin) is required to edit users. 2015-02-25 10:59:41 +01:00
42b0a8bba6 Re-arranged supervisor notification settings. 2015-02-24 15:00:04 +01:00
golrokh
a4b5822181 Removed unused code for activity dialog 2015-02-24 14:44:44 +01:00
golrokh
47f1edbf3e Fixed the problem with menu hierarchy in supervisor my ideas 2015-02-24 14:38:02 +01:00
golrokh
406850138d Better page for viewing idea details 2015-02-24 14:19:20 +01:00
d7093803f5 It is now possible (with modern browsers) to attach multiple files to forum posts. How-to depends on browser. 2015-02-24 14:12:19 +01:00
4cce8c6927 Added confirmation dialog when toggling notification settings. 2015-02-24 13:57:25 +01:00
527647ab37 Added the users own profile image to the basic profile page so they can see it while editing. 2015-02-24 13:53:22 +01:00
df23fda4cb Bootstrapped HTML. 2015-02-24 13:48:05 +01:00
b19cb9ef62 Reshuffled the permissions for the Users part of the admin interface. Admin role can now edit local users and give/remove all roles that their own roles are authorized for. 2015-02-24 13:27:12 +01:00
47e6ff5dd3 Added confirmation dialog when giving/removing roles. 2015-02-24 13:17:20 +01:00
6a15850939 It is now possible to add projects to your group where you are only co-supervisor. 2015-02-24 12:54:50 +01:00
golrokh
e508fb922b Implemented showing Idea detail in a new page not in a popup 2015-02-24 11:06:30 +01:00
golrokh
7fb33bc658 Merge remote-tracking branch 'origin/develop' into develop 2015-02-24 11:01:59 +01:00
golrokh
fdab5fc760 Implemented showing Idea detail in a new page not in a popup 2015-02-24 11:01:48 +01:00
704d426938 Added breadcrumbs for rough draft and final seminar approvals. 2015-02-24 10:28:14 +01:00
25f3e8cd94 Tiny HTML changes. 2015-02-24 10:28:14 +01:00
golrokh
b5ff16c64c Removed the links for popup in activities 2015-02-24 08:35:37 +01:00