17768 Commits

Author SHA1 Message Date
Emil Siverhall
ed66d35acd Merge branch 'first_meeting' into develop 2013-04-16 15:02:02 +02:00
Emil Siverhall
b2a65cb0b7 creating activity plan with first meeting details when exporting ideas, if information is available 2013-04-16 14:20:08 +02:00
Emil Siverhall
5be25f0bea idea export workers web notifications pointed to wrong sourceUrl (projectideas2, the old temporary url) 2013-04-16 14:20:06 +02:00
Emil Siverhall
189a85e493 Merge branch 'defect/project_titles' into develop 2013-04-16 14:18:50 +02:00
Emil Siverhall
7374b2f425 checkbox alignment 2013-04-16 14:14:44 +02:00
Emil Siverhall
927cf19a1b hide external organisation from project details panel, if in supervisor view. 2013-04-16 13:17:15 +02:00
Emil Siverhall
aa8944d31c removed project title from seminar panel as well. title is in the title bar (if open inside a dialog) 2013-04-16 11:07:50 +02:00
Emil Siverhall
f635238c87 removed project title from project details panel 2013-04-16 10:52:00 +02:00
fred-fri
993a801917 adding query method for finding a reviewers projects 2013-04-16 17:12:44 +09:00
Emil Siverhall
df0ef55383 Merge branch 'forum/minor_fixes' into develop 2013-04-16 09:40:57 +02:00
Emil Siverhall
4455afa87b removed unused imports 2013-04-16 09:39:18 +02:00
Emil Siverhall
5c9c30bd95 removed clean() method from onReply 2013-04-16 09:39:16 +02:00
Emil Siverhall
be05aa5855 cleanup.. 2013-04-16 09:39:14 +02:00
Emil Siverhall
4432f9045a refactored out the toggleable panel since we dont want to use that functionality any longer 2013-04-16 09:39:12 +02:00
Emil Siverhall
e40fa7a316 some forum service refactorings to avoid duplicated code 2013-04-16 09:39:09 +02:00
Emil Siverhall
48e054505c removed some unnecessary outputmarkupid's that logged warnings 2013-04-16 09:39:07 +02:00
Emil Siverhall
6e898c2260 changed submit-button text 2013-04-16 09:39:05 +02:00
fred-fri
715ed9c44a adding query method for finding a reviewers projects 2013-04-16 16:31:56 +09:00
fred-fri
cb42c6aa15 adding columns 2013-04-16 15:22:39 +09:00
fred-fri
891e5d342d adding dp 2013-04-16 13:42:38 +09:00
fred-fri
1bb72f2ee0 added test for page 2013-04-16 13:29:39 +09:00
fred-fri
55b84b4aaa added reviewing page 2013-04-16 13:24:36 +09:00
fred-fri
322cedd9bf changed wording 2013-04-16 12:07:13 +09:00
fred-fri
23863a1c71 changed wording 2013-04-16 12:05:39 +09:00
fred-fri
e868e10eea changed wording 2013-04-16 12:05:07 +09:00
fred-fri
fbca1e3fa5 changed wording 2013-04-16 12:04:35 +09:00
fred-fri
4bbe553185 changed wording 2013-04-16 12:01:09 +09:00
fred-fri
09e3d1b61c changed wording 2013-04-16 11:59:33 +09:00
fred-fri
65ac655d06 added notification to peer reviewers supervisor about completed review 2013-04-16 11:40:16 +09:00
e76d34b68a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-04-15 09:08:27 +02:00
fred-fri
e42684be21 added setread 2013-04-15 15:06:10 +09:00
ff44371f2d Merge branch 'develop' into feature/non_workday_hookup 2013-04-12 16:15:23 +02:00
23caf7bb44 Un-ignored tests, API is up and running 2013-04-12 16:13:51 +02:00
Emil Siverhall
a7a44f5dc0 Merge branch 'feature/forum/attachments' into develop 2013-04-12 15:02:15 +02:00
Emil Siverhall
3d5e26ae00 line break 2013-04-12 15:01:54 +02:00
Emil Siverhall
20fa8b0ef7 added attachment upload to replies as well 2013-04-12 14:48:07 +02:00
Emil Siverhall
4cc923354e fixed merge conflicts 2013-04-12 13:43:41 +02:00
fred-fri
65e0e276cd added test 2013-04-12 18:35:47 +09:00
fred-fri
a153a06ce1 added readonly false to method 2013-04-12 18:25:50 +09:00
fred-fri
0ecbd72c4b fixed a test 2013-04-12 18:18:45 +09:00
fred-fri
ac8f2e55a5 minor cleanup 2013-04-12 18:15:21 +09:00
fred-fri
a137fc0ccd fixed conflicts 2013-04-12 18:08:47 +09:00
fred-fri
9292680dde fixed fragment visibility bug 2013-04-12 15:40:27 +09:00
fred-fri
46923f8bdd made replies thread centric 2013-04-12 15:37:41 +09:00
fred-fri
5b08fcf894 Merge branch 'release20130412b' 20130412b 2013-04-12 12:17:01 +09:00
fred-fri
5609ada7ee forced to add @ignore to tests because api returns 500 on all calls 2013-04-12 12:16:15 +09:00
fred-fri
51248df6ae Merge branch 'release20130412' 20130412 2013-04-12 11:46:15 +09:00
fred-fri
513739b759 added new sql file 2013-04-12 11:45:19 +09:00
fred-fri
81734414b3 cleanup 2013-04-12 11:23:16 +09:00
Emil Siverhall
53db015d78 Merge branch 'state_mouseover' into develop 2013-04-11 22:00:01 +02:00