Emil Siverhall
|
6ddd5981eb
|
Merge branch 'forum/color' into develop
|
2013-05-20 15:03:40 +02:00 |
|
Emil Siverhall
|
ade3c60076
|
fixed some failing tests due to wrapper container being added
|
2013-05-20 15:01:52 +02:00 |
|
Emil Siverhall
|
78021471c5
|
changed to mark reply-to message with a grey border instead of colored subject
|
2013-05-20 14:37:23 +02:00 |
|
Emil Siverhall
|
0b09dbe157
|
new tests to forum panel
|
2013-05-20 14:35:05 +02:00 |
|
Emil Siverhall
|
b88bfa07ed
|
make sure we remove highlight from last clicked reply-message if we press another.
|
2013-05-20 14:33:39 +02:00 |
|
Emil Siverhall
|
b6c3470f22
|
color switch on current reply, first version
|
2013-05-20 14:31:50 +02:00 |
|
Emil Siverhall
|
2f3e55cabf
|
Merge branch 'file_download' into develop
|
2013-05-20 14:12:58 +02:00 |
|
Emil Siverhall
|
c8902377ca
|
text fix
|
2013-05-20 14:11:08 +02:00 |
|
Emil Siverhall
|
76731a6f00
|
new attachment panel for oppositions as well.l
|
2013-05-20 14:11:05 +02:00 |
|
Emil Siverhall
|
07902e5527
|
added new view attachment panel to seminar thesis panel as well
|
2013-05-20 14:11:02 +02:00 |
|
Emil Siverhall
|
f5c87f2158
|
using new file open/download component on thesis comments as well
|
2013-05-20 14:11:00 +02:00 |
|
Emil Siverhall
|
2c3f87aa83
|
added download and open links to view attachment panel
|
2013-05-20 14:10:57 +02:00 |
|
Emil Siverhall
|
a4e41c07cd
|
showing file name of description object
|
2013-05-20 14:10:55 +02:00 |
|
Emil Siverhall
|
9ee0ed030b
|
base strucutr for new view attachment panel
|
2013-05-20 14:10:52 +02:00 |
|
fred-fri
|
28a859e6ae
|
Merge branch 'html' into develop
|
2013-05-20 17:39:25 +09:00 |
|
fred-fri
|
17ee6d9431
|
only prod runs turnitinworker
|
2013-05-20 17:39:18 +09:00 |
|
fred-fri
|
932466605e
|
added deletion of turnitincheck objects whose file isnt used in any seminar
|
2013-05-20 15:30:31 +09:00 |
|
fred-fri
|
74cc968580
|
better delete log
|
2013-05-20 12:15:00 +09:00 |
|
fred-fri
|
1d1aa206fe
|
fixed final seminar deleted notification subject null bug and improved logging to show when the deadline was and when the file was uploaded for evidence
|
2013-05-20 11:54:54 +09:00 |
|
fred-fri
|
0c519c4411
|
fixed notificationdatapanel userlinkpanel bug
|
2013-05-20 10:56:38 +09:00 |
|
fred-fri
|
61ec54acfe
|
Merge branch 'fix2' into develop
|
2013-05-20 10:26:05 +09:00 |
|
fred-fri
|
0175e61688
|
fixed notifications page bug
20130520b
|
2013-05-20 10:21:48 +09:00 |
|
fred-fri
|
bc01742fde
|
Merge branch 'fix' into develop
|
2013-05-20 10:03:59 +09:00 |
|
fred-fri
|
59fbf18db6
|
turned off worker
fix20130520
|
2013-05-20 09:57:50 +09:00 |
|
fred-fri
|
4f68c4ec3e
|
added if statement that looks at session when uploading files
|
2013-05-20 09:36:38 +09:00 |
|
Emil Siverhall
|
e3d59d60f4
|
Merge branch 'forum/re' into develop
|
2013-05-17 10:31:37 +02:00 |
|
Emil Siverhall
|
bae0c097be
|
merge conflicts
|
2013-05-17 10:28:28 +02:00 |
|
Emil Siverhall
|
b76f08312a
|
test for new getSubject service method
|
2013-05-17 10:16:16 +02:00 |
|
Emil Siverhall
|
90a0747a5f
|
we now send Re(number) with mail notifications as well
|
2013-05-17 10:16:14 +02:00 |
|
Emil Siverhall
|
831f7fb7d6
|
updated current.sql with additional source
|
2013-05-17 10:16:10 +02:00 |
|
Emil Siverhall
|
676ceb318d
|
correct formatting on mail compilations
|
2013-05-17 10:15:32 +02:00 |
|
Emil Siverhall
|
f64a040193
|
implemented additional message on forum notifications
|
2013-05-17 10:15:30 +02:00 |
|
Emil Siverhall
|
a7ea25b971
|
added support for an additional message when sending notifications. we want to send both post subject and content when notifying about forum posts
|
2013-05-17 10:15:27 +02:00 |
|
Emil Siverhall
|
123788eb8b
|
some service tests to forum service
|
2013-05-17 10:15:24 +02:00 |
|
Emil Siverhall
|
aae642865c
|
added Re(i): before subject if forum post is a reply
|
2013-05-17 10:15:22 +02:00 |
|
Emil Siverhall
|
2ca7df2fe7
|
prevent lazy loading exception when sending notifications on forum replies + correct mail formatting
|
2013-05-17 10:14:21 +02:00 |
|
Emil Siverhall
|
fd6357093c
|
notifications on forum replies as well
|
2013-05-17 10:14:18 +02:00 |
|
Emil Siverhall
|
37bee34655
|
added notification on new forum post
|
2013-05-17 10:11:42 +02:00 |
|
Emil Siverhall
|
ad1ce9d9d6
|
forum service method to count posts per thread
|
2013-05-17 10:11:39 +02:00 |
|
Emil Siverhall
|
226597182d
|
some new tests to forum panel
|
2013-05-17 10:11:37 +02:00 |
|
fred-fri
|
a515d88b35
|
Merge branch 'release20130517'
20130517
|
2013-05-17 13:40:37 +09:00 |
|
fred-fri
|
ca7cb53fff
|
added new db update file
|
2013-05-17 13:40:26 +09:00 |
|
fred-fri
|
d7b74c7c1c
|
some improvements and additions to profile popup
|
2013-05-17 13:01:20 +09:00 |
|
fred-fri
|
b200e9f108
|
added daisyprofileurl
|
2013-05-17 11:42:53 +09:00 |
|
fred-fri
|
059df4d123
|
some typos
|
2013-05-17 11:17:43 +09:00 |
|
fred-fri
|
6a220acb42
|
changed from reviewers to reviewer and removed old unused panel
|
2013-05-17 11:03:58 +09:00 |
|
fred-fri
|
e6595df241
|
fixed conflicts
|
2013-05-16 17:08:51 +09:00 |
|
fred-fri
|
d3cf3f1345
|
deleted unused notificationeventpanels
|
2013-05-16 16:53:58 +09:00 |
|
fred-fri
|
2b7ef13ba0
|
fixed some bugs
|
2013-05-16 16:40:43 +09:00 |
|
fred-fri
|
ddb9de3b7e
|
added confirmation
|
2013-05-16 16:22:36 +09:00 |
|