6429 Commits

Author SHA1 Message Date
nikos
1eda2f7a44 Removed unused code and useless comments 2015-03-26 14:55:21 +01:00
nikos
2661436aca Merge remote-tracking branch 'origin/develop' into develop 2015-03-26 14:37:25 +01:00
nikos
701eea8ad0 Removed panel and setting relating to number of peer reviews performed.
other minor improvements
2015-03-26 14:37:06 +01:00
b2cb4b2433 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-03-26 12:22:40 +01:00
1eeb6c33ff notify on missed approvals 2015-03-26 12:22:28 +01:00
golrokh
da344b417e Fixed thech-problems for external link for ideas 2015-03-26 11:08:20 +01:00
golrokh
e5ac82b996 Merge remote-tracking branch 'origin/develop' into develop 2015-03-26 10:54:43 +01:00
golrokh
59bd513228 Removed everything related to the preliminary grading report- removed thesis review as well 2015-03-26 10:54:37 +01:00
90baa18cd9 Limited profile picture size to 1 MB. 2015-03-26 10:12:36 +01:00
fe82f4858c Merge remote-tracking branch 'origin/develop' into develop 2015-03-26 10:02:53 +01:00
98da8d1db4 Made the text different for rough draft/final seminar decisions/requests. 2015-03-26 10:02:44 +01:00
720ddfecad Restyled the approved panel in the reviewing process timeline. 2015-03-26 09:55:47 +01:00
aa5b39d40c Restyled the denied panel in the reviewing process timeline. 2015-03-26 09:54:07 +01:00
8e0231c749 Restyled the requested panel in the reviewing process timeline. 2015-03-26 09:46:59 +01:00
golrokh
885868df3b Removed everything related to the preliminary grading report- fixed tests and removed more 2015-03-26 09:43:29 +01:00
golrokh
5b015edfec Removed everything related to the preliminary grading report- fixed problem with not rendering examiner page 2015-03-26 09:30:40 +01:00
golrokh
0735d78cec Removed everything related to the preliminary grading report 2015-03-26 09:02:04 +01:00
golrokh
258e07ad34 Merge branch 'removePreliminaryGradingReport' into develop 2015-03-26 08:36:12 +01:00
golrokh
58ae7d9eb8 Removed everything related to the preliminary grading report 2015-03-25 18:40:03 +01:00
golrokh
8d42894fa9 Removed external idea url from project partner 2015-03-25 17:31:30 +01:00
golrokh
83a96ea3aa Added external link for getting started with idea for author 2015-03-25 16:41:27 +01:00
3b53ad81ff Revert "Removed listing of the current profile picture and the delete functionality."
This reverts commit a76759c02324432aa23aee11630435f00a633024.
2015-03-25 13:47:22 +01:00
golrokh
a19d073459 Fixed the size of the numbers in peer statistics 2015-03-25 09:44:26 +01:00
golrokh
284a884e77 Merge remote-tracking branch 'origin/develop' into develop 2015-03-24 17:27:50 +01:00
golrokh
2823244614 Removed the possibility for creating any further preliminary grading reports for both Supervisor and Reviewer, those which have already created show be viewable for now! 2015-03-24 17:23:51 +01:00
213cad7a93 Removed research plan. 2015-03-24 16:56:41 +01:00
cb43f0c7ad Hid the upload field for supervisors in the activity plan. 2015-03-24 16:43:52 +01:00
a76759c023 Removed listing of the current profile picture and the delete functionality. 2015-03-24 16:08:25 +01:00
afdc9d3ade Added a "hash" of the picture files id to the URL for user profile images so that we can aggressively cache the images but also notice changes. The hash is ignored and only there so the browser knows to retrieve the new one. 2015-03-24 16:07:28 +01:00
0ffcc9d396 Made it so a fallback profile picture is displayed if a user selected file but did not upload one. 2015-03-24 16:01:40 +01:00
f3e1aa3a57 Fixed test. 2015-03-24 15:50:30 +01:00
a9a46afd5c Fixed problem with refreshing the timeline when posting new messages by removing the AJAX crap. 2015-03-24 15:38:25 +01:00
636d8f0041 Removed useless HTML. 2015-03-24 15:30:57 +01:00
9d01b014a4 Simple panel for displaying a timeline of reviewer related events for a given project. 2015-03-24 15:29:36 +01:00
61fc197c64 Removed useless stuff. 2015-03-24 10:15:00 +01:00
golrokh
19f42ae3bb Fixed the numbers in peer review statistics 2015-03-24 10:15:23 +01:00
f3e60de813 Changed text. 2015-03-23 15:54:38 +01:00
37c1cf7392 Made it possible to delete your profile image. 2015-03-23 15:51:55 +01:00
23aedf64fd Handled the case when a user selected uploaded file as profile picture but did not actually upload one. 2015-03-23 15:50:31 +01:00
31b5b1c696 Renamed GravatarImage to UserProfileImage. 2015-03-23 15:35:54 +01:00
b448534004 Refactored a bit. 2015-03-23 15:33:37 +01:00
3a8f737352 Made the uploaded profile picture show. 2015-03-23 15:08:51 +01:00
5a31c84ba4 Merge branch 'develop' into user_profile 2015-03-23 14:01:37 +01:00
b0937e1f6d Start of selecting user profile picture. 2015-03-23 13:18:05 +01:00
nikos
7de24e5b8f Change "peer portal" to something without "portal" 2015-03-23 12:38:34 +01:00
4f08e89915 Added more choices for profile image. 2015-03-23 10:16:26 +01:00
8efbbfd2d1 Added title to the author idea details page.
Hid the program stuff when there are no programs for the current user.
2015-03-20 16:58:47 +01:00
37896cbcae More cleaning up. 2015-03-20 15:15:59 +01:00
1a25028658 More cleaning up. 2015-03-20 15:15:54 +01:00
99e8b1bfe3 More cleaning up. 2015-03-20 15:10:21 +01:00