3995 Commits

Author SHA1 Message Date
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
59bd513228 Removed everything related to the preliminary grading report- removed thesis review as well 2015-03-26 10:54:37 +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
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
68445f7839 Merge remote-tracking branch 'origin/develop' into develop 2015-03-25 17:31:41 +01:00
21870af2b2 Merge remote-tracking branch 'origin/develop' into develop 2015-03-25 17:29:51 +01:00
68ea82ea4f Added infrastructure for additional search services when using the auto-complete components. 2015-03-25 17:29:01 +01:00
golrokh
cf107a7770 Renamed migration file 2015-03-25 16:59:45 +01:00
golrokh
0c6c373531 Merge branch 'develop' into removePreliminaryGradingReport 2015-03-25 16:43:01 +01:00
golrokh
83a96ea3aa Added external link for getting started with idea for author 2015-03-25 16:41:27 +01:00
c031449276 notify on missed approvals 2015-03-24 18:39:40 +01:00
80724ae6c6 notify on missed approvals 2015-03-24 18:35:54 +01:00
0140076f08 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-03-24 18:18:37 +01:00
79be51afc3 notify on missed approvals 2015-03-24 18:18:17 +01:00
213cad7a93 Removed research plan. 2015-03-24 16:56:41 +01:00
23500bfbf5 Added name of the user who caused the notification to the compilation mail. 2015-03-24 16:39:23 +01:00
golrokh
5553793208 Added Sql 2015-03-24 15:47:33 +01:00
13da70e4d7 Fixed ordering of reviewer approval decisions. 2015-03-24 10:47:10 +01:00
golrokh
19f42ae3bb Fixed the numbers in peer review statistics 2015-03-24 10:15:23 +01:00
9689a9ef55 Fixed problem with first meeting reminder worker. 2015-03-23 18:19:24 +01:00
3090e53bfe Merge remote-tracking branch 'origin/develop' into develop 2015-03-23 15:52:33 +01:00
248378736c DROP TABLE ReviewerApproval_Decision fix2 2015-03-23 15:25:51 +01:00
934e25396f Merge branch 'develop' into user_profile 2015-03-23 15:09:15 +01:00
3a8f737352 Made the uploaded profile picture show. 2015-03-23 15:08:51 +01:00
546570e1ed Version conflict. 2015-03-23 14:06:42 +01:00
836dac027b Merge remote-tracking branch 'origin/develop' into develop 2015-03-23 14:01:59 +01:00
5a31c84ba4 Merge branch 'develop' into user_profile 2015-03-23 14:01:37 +01:00
873d2404ad DROP TABLE ReviewerApproval_Decision fix 2015-03-23 14:01:36 +01:00
75045da129 '' apparently prevents argument substitution. 2015-03-23 13:58:52 +01:00
65814a5bd1 More toString madness. 2015-03-23 13:56:05 +01:00
8daad4a215 Changed so that first meeting reminders only go out to completed ideas. 2015-03-23 13:22:31 +01:00
e3da86467a Merge remote-tracking branch 'origin/develop' into develop 2015-03-23 13:18:56 +01:00
39701479cf Fixed typo 2015-03-23 13:18:52 +01:00
b8a8e888c0 DROP TABLE ReviewerApproval_Decision 2015-03-23 13:09:13 +01:00
4f08e89915 Added more choices for profile image. 2015-03-23 10:16:26 +01:00
61c0fbf3b7 Included comment in the reviewer support mail that goes out when a request is made for a project without reviewer. 2015-03-20 15:27:46 +01:00
fb88667e3f Added authors to the reviewer support mail when an approval is requested. 2015-03-20 14:55:09 +01:00
af6ddad4d8 Changed project details dialog for authors to a separate page. 2015-03-20 12:53:19 +01:00
481b2a4087 De-Lomboked some getters. 2015-03-20 09:35:55 +01:00
8674594f02 Merge remote-tracking branch 'origin/develop' into develop 2015-03-20 09:34:08 +01:00
b1e9bf3afb GRU is now added as BCC to first meeting reminder that goes out on course start. 2015-03-20 09:33:57 +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
b9b9531f1a More TODO stuff. 2015-03-19 12:10:35 +01:00
6947b9e90b Attempt at reducing complexity by removing unnecessary checks and re-using previous ones. 2015-03-19 12:04:40 +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
60747fc1c1 Merge remote-tracking branch 'origin/develop' into develop 2015-03-19 08:32:12 +01:00