6348 Commits

Author SHA1 Message Date
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
b877a9b54d More cleaning up. 2015-03-20 15:07:51 +01:00
718d8066a6 Fixed proper Bootstrap HTML. 2015-03-20 15:04:21 +01:00
af6ddad4d8 Changed project details dialog for authors to a separate page. 2015-03-20 12:53:19 +01:00
0dfd7aadcf Suspect stuff. 2015-03-20 10:28:25 +01:00
a20983c984 Bootstrapped HTML. 2015-03-20 10:24:00 +01:00
ad44edae5a Simplified. 2015-03-20 10:10:02 +01:00
0355d0af62 Minor HTML touches. 2015-03-20 10:03:23 +01:00
4c178b4946 Simplified. 2015-03-20 09:56:59 +01:00
5bd010f387 Simplified. 2015-03-20 09:54:18 +01:00
8674594f02 Merge remote-tracking branch 'origin/develop' into develop 2015-03-20 09:34:08 +01:00
0f15c91689 Simplified. 2015-03-20 09:25:18 +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
golrokh
e51c4cfb7f Better text 2015-03-19 16:46:41 +01:00
a2ecf9d370 Removed stupid boolean parameter that just hide the entire panel. 2015-03-19 14:08:40 +01:00
5450e6acad Fixed double title problem 2015-03-19 14:06:32 +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
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
1588a015b5 Moved "Non work days" under "Project Management" from "System". 2015-03-18 16:35:20 +01:00