fred-fri
|
e66c1ee244
|
Merge branch 'release20130426'
201
20130426
|
2013-04-26 15:05:26 +09:00 |
|
fred-fri
|
877847884d
|
new db file
|
2013-04-26 15:05:19 +09:00 |
|
fred-fri
|
b60d1dd39b
|
Merge branch 'release20130426'
|
2013-04-26 15:04:32 +09:00 |
|
Emil Siverhall
|
d4e1c2047a
|
Merge branch 'thesis_comment_mandatory' into develop
|
2013-04-24 12:36:13 +02:00 |
|
Emil Siverhall
|
011dfd2dfa
|
minor test fix
|
2013-04-24 12:34:51 +02:00 |
|
Emil Siverhall
|
c1b4cada50
|
updated current sql with mandatory thesis comment setting
|
2013-04-24 12:11:33 +02:00 |
|
Emil Siverhall
|
655b488102
|
only show mandatory checkbox if thesis comments are enabled
|
2013-04-24 11:55:56 +02:00 |
|
Emil Siverhall
|
abfaf74cbc
|
admin setting for mandatory thesis reviews
|
2013-04-24 11:54:59 +02:00 |
|
Richard
|
33a0817f95
|
Resolved conflicts forum
|
2013-04-24 09:31:38 +02:00 |
|
fred-fri
|
5d2fd2434f
|
change to comment link string
|
2013-04-24 14:13:08 +09:00 |
|
Emil Siverhall
|
60b4c3e502
|
Merge branch 'my_projects_link' into develop
|
2013-04-22 18:25:29 +02:00 |
|
Emil Siverhall
|
90830883ff
|
removed back links on supervisor and author project overview pages
|
2013-04-22 18:23:30 +02:00 |
|
Emil Siverhall
|
8c45cc5c27
|
Merge branch 'release20130419'
20130419
|
2013-04-19 11:02:25 +02:00 |
|
Emil Siverhall
|
6d9bef7966
|
added new current.sql file
|
2013-04-19 10:59:40 +02:00 |
|
Emil Siverhall
|
10b9ce18ce
|
Merge branch 'forum/buttons' into develop
|
2013-04-18 14:24:38 +02:00 |
|
Emil Siverhall
|
cab2157a72
|
create message button should be visible when hitting reply button
|
2013-04-18 14:24:26 +02:00 |
|
Emil Siverhall
|
7c9eba3f9f
|
removed cancel button from create forum thread panel
|
2013-04-18 14:24:24 +02:00 |
|
Emil Siverhall
|
a95600fad3
|
Merge branch 'improvement/examining' into develop
|
2013-04-18 13:28:07 +02:00 |
|
Emil Siverhall
|
d6e41363a7
|
minor improvements
|
2013-04-18 13:26:35 +02:00 |
|
Emil Siverhall
|
fd26511972
|
changed radio filter labels on examining panel
|
2013-04-18 13:08:54 +02:00 |
|
Emil Siverhall
|
15b0724678
|
Merge branch 'examiner_notification' into develop
|
2013-04-18 11:30:02 +02:00 |
|
Emil Siverhall
|
95fc39995e
|
only notify active examiners
|
2013-04-18 10:42:25 +02:00 |
|
Emil Siverhall
|
92a978d87a
|
added query to only fetch non-deleted examiners
|
2013-04-18 10:42:23 +02:00 |
|
Emil Siverhall
|
1191a421e8
|
adding all examiners as additional recipients when uploading thesis
|
2013-04-18 10:42:20 +02:00 |
|
Emil Siverhall
|
1cb4951cdc
|
added additionalRecipients to notificationSource
|
2013-04-18 10:42:18 +02:00 |
|
Emil Siverhall
|
de3af4ebb6
|
added examiner as a possible seminar event notification receiver
|
2013-04-18 10:42:16 +02:00 |
|
Emil Siverhall
|
1705d150d6
|
Merge branch 'forum/scroll' into develop
|
2013-04-17 12:27:13 +02:00 |
|
Emil Siverhall
|
63ce104007
|
appended javascript to scroll to top when pushing reply button
|
2013-04-17 12:26:46 +02:00 |
|
Richard
|
fd086c6eae
|
Komplett stilsättning av forumet.
|
2013-04-17 11:56:51 +02:00 |
|
Emil Siverhall
|
2b2af54ab0
|
Merge branch 'feature/thesis_comment_notification' into develop
|
2013-04-17 10:51:48 +02:00 |
|
Emil Siverhall
|
5ffcdddbec
|
notification added to SeminarEvent object and properties as well
|
2013-04-17 10:45:53 +02:00 |
|
Emil Siverhall
|
38307d9c55
|
notification on submitted thesis comments added to upload controller
|
2013-04-17 10:45:20 +02:00 |
|
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 |
|
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
|
322cedd9bf
|
changed wording
|
2013-04-16 12:07:13 +09:00 |
|
fred-fri
|
23863a1c71
|
changed wording
|
2013-04-16 12:05:39 +09:00 |
|