fred-fri
|
305f69cc51
|
fixed misphrase
|
2013-04-10 10:27:01 +09:00 |
|
Emil Siverhall
|
22b9033669
|
Merge branch 'feature/forum/feedback' into feature/forum/threads
|
2013-04-09 15:02:53 +02:00 |
|
Emil Siverhall
|
7166b9fb5e
|
placeholder text changes and properties for feedback error messages
|
2013-04-09 14:57:39 +02:00 |
|
Emil Siverhall
|
b0fcfadc17
|
added feedback to display error message when forum post submission fails
|
2013-04-09 14:30:59 +02:00 |
|
Emil Siverhall
|
520ff87bcd
|
when creating new forum threads, the original post is now marked as read by the submitting user
|
2013-04-09 13:05:48 +02:00 |
|
fred-fri
|
24b223e645
|
cleanup
|
2013-04-09 17:15:11 +09:00 |
|
fred-fri
|
484bab206f
|
added tests and made slight changes to methods
|
2013-04-09 17:14:54 +09:00 |
|
fred-fri
|
8bc3f12483
|
some clarifying comments
|
2013-04-09 16:40:43 +09:00 |
|
fred-fri
|
6f609257f6
|
some clarifying comments
|
2013-04-09 16:40:35 +09:00 |
|
fred-fri
|
fc952175ae
|
some clarifying comments
|
2013-04-09 16:40:15 +09:00 |
|
fred-fri
|
9582c721cd
|
changing from delete to inactivation
|
2013-04-09 15:56:21 +09:00 |
|
fred-fri
|
745ac20cb2
|
some gui logic
|
2013-04-09 14:53:40 +09:00 |
|
fred-fri
|
7fec187a85
|
sql fix
|
2013-04-09 14:45:13 +09:00 |
|
fred-fri
|
4241cad03d
|
added lots of statements for removing old idea stuff that was causing errors when trying to delete projects
|
2013-04-09 13:42:06 +09:00 |
|
fred-fri
|
d1c86a3523
|
adding methods for inactivating newidea connected to project
|
2013-04-09 12:11:38 +09:00 |
|
fred-fri
|
b6ef2a629f
|
adding methods for inactivating newidea connected to project
|
2013-04-09 11:52:24 +09:00 |
|
fred-fri
|
209bebbfb2
|
added methods for removing connection to project from newidea
|
2013-04-09 11:38:24 +09:00 |
|
fred-fri
|
6114cff345
|
adding methods for removing connections to newidea before deleting project
|
2013-04-09 11:26:37 +09:00 |
|
fred-fri
|
6a94fab4a6
|
added delete column to project management dataview
|
2013-04-09 11:19:37 +09:00 |
|
fred-fri
|
904e31ad57
|
added sql remove statement
|
2013-04-09 11:13:43 +09:00 |
|
fred-fri
|
a287964944
|
added springbean annotation to service pointer
|
2013-04-09 10:52:52 +09:00 |
|
Emil Siverhall
|
5710b15c85
|
Merge branch 'notification_enhancements' into develop
|
2013-04-08 20:27:15 +02:00 |
|
Emil Siverhall
|
6807cbc8eb
|
removed punctuation on traffic light statuses
|
2013-04-08 20:24:13 +02:00 |
|
Emil Siverhall
|
86fe642677
|
removed compilation suffix for peer notifications for now..
|
2013-04-08 20:11:21 +02:00 |
|
Emil Siverhall
|
de8eb57fc2
|
added information about which project notifications in mail compilations concern
|
2013-04-08 16:19:15 +02:00 |
|
Emil Siverhall
|
04b3133514
|
we want to display the description of the current project state, not just the traffic light color
|
2013-04-08 14:43:03 +02:00 |
|
fred-fri
|
a83238078f
|
turned off turnitin worker for other profiles than prod (master)
|
2013-04-08 11:29:19 +09:00 |
|
fred-fri
|
7c6345efb1
|
made a bunch of working tests
|
2013-04-08 10:42:37 +09:00 |
|
Emil Siverhall
|
37c199ff98
|
Merge branch 'thesis_review_fix' into develop
|
2013-04-07 21:08:28 +02:00 |
|
Emil Siverhall
|
6b513b1b80
|
thesis review upload is not visible for supervisors if no thesis is uploaded
|
2013-04-07 21:05:07 +02:00 |
|
Emil Siverhall
|
333d501b73
|
Merge branch 'mail_fix' into develop
|
2013-04-07 20:31:00 +02:00 |
|
Emil Siverhall
|
cd61217837
|
fixed formatting bug when compiling mail
|
2013-04-07 20:30:36 +02:00 |
|
Emil Siverhall
|
aa16cbadbd
|
Merge branch 'examiner_updates' into develop
|
2013-04-05 15:14:50 +02:00 |
|
Emil Siverhall
|
ac095d4dfa
|
examiner may now only select seminar to review from a list of seminars with thesis uploaded
|
2013-04-05 15:10:42 +02:00 |
|
fred-fri
|
6855606438
|
playing with tests
|
2013-04-05 18:36:23 +09:00 |
|
fred-fri
|
dc9241dc89
|
fixed findall nullpointer
|
2013-04-05 17:17:47 +09:00 |
|
fred-fri
|
3e8af8bd9a
|
fixed repo nullpointer
|
2013-04-05 16:55:58 +09:00 |
|
fred-fri
|
2a9a0bd609
|
Merge branch 'release20130405'
20130405
|
2013-04-05 13:57:27 +09:00 |
|
fred-fri
|
bcd7c64e21
|
added new db file
|
2013-04-05 13:57:08 +09:00 |
|
Emil Siverhall
|
6abaead5f9
|
Merge branch 'forum/read_posts' into feature/forum/threads
|
2013-04-04 11:20:38 +02:00 |
|
Emil Siverhall
|
a82523800e
|
added read state panel to the new post details panel
|
2013-04-04 11:19:47 +02:00 |
|
Emil Siverhall
|
51e442e2d2
|
refactoring to make a separate panel to view all posts on a projects forum page
|
2013-04-04 11:03:56 +02:00 |
|
Emil Siverhall
|
e0b44b48bb
|
refactoring to forum, new panel for each post details
|
2013-04-04 11:03:54 +02:00 |
|
fred-fri
|
7d02e3c69a
|
working with tests, still get problems
|
2013-04-04 16:50:30 +09:00 |
|
fred-fri
|
05a97eda10
|
working with tests, still get problems
|
2013-04-04 16:36:46 +09:00 |
|
fred-fri
|
eb40a3c3e6
|
some cleanuå
|
2013-04-04 14:29:33 +09:00 |
|
fred-fri
|
5febeca9bf
|
made enter comment a placeholder, added validation for comment field
|
2013-04-04 14:15:52 +09:00 |
|
fred-fri
|
6082b42b52
|
added deletion
|
2013-04-04 14:04:53 +09:00 |
|
fred-fri
|
25a93446da
|
fixed edit bug
|
2013-04-04 13:42:34 +09:00 |
|
Emil Siverhall
|
37dcf999c8
|
Merge branch 'meeting_fix' into develop
|
2013-04-02 23:21:53 +02:00 |
|