|
|
93a885e4d8
|
Fixed so that forum mails fetch the correct entity and redirects the user correctly.
|
2014-12-08 14:12:59 +01:00 |
|
|
|
7d41e5e7a9
|
Fixed SQL migration version conflict.
|
2014-12-08 13:20:12 +01:00 |
|
|
|
f142f87be6
|
Merge branch 'notification_cleaning_after_landing_page' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java
core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/CreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/GradingCreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/group/GroupForum.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java
|
2014-12-08 13:19:10 +01:00 |
|
|
|
e7bcaa90e4
|
Fixed version conflict in SQL migrations.
|
2014-12-08 13:06:55 +01:00 |
|
|
|
db0c5279b0
|
Merge remote-tracking branch 'origin/develop' into user_events
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
|
2014-12-08 13:06:35 +01:00 |
|
|
|
6839ebc3e8
|
Removed Membership interface.
|
2014-12-08 13:01:59 +01:00 |
|
fred-fri
|
f5d8b85f86
|
public file page
|
2014-12-05 10:05:18 +09:00 |
|
golrokh
|
3c324cfe4c
|
better code for showing number of unread supervisor interaction posts in reviewer page
|
2014-12-04 12:54:29 +01:00 |
|
golrokh
|
c957466292
|
1- Set ForumPosts read when user views the thread.
2- Added a badge with total number of unread interaction with posts on reviewPage
|
2014-12-03 14:46:12 +01:00 |
|
fred-fri
|
01c64a57f7
|
grade statistics
|
2014-12-02 19:11:57 +09:00 |
|
|
|
bdd87f098b
|
Merge branch 'develop' into notification_cleaning_after_landing_page
|
2014-12-01 15:33:09 +01:00 |
|
|
|
b8662f13d6
|
Reporting grade now saves the date it was reported and also who reported it.
|
2014-12-01 13:51:08 +01:00 |
|
|
|
b2042988f7
|
Suppressed error when deleting a FileDescription if the actual file data had already been deleted.
|
2014-11-28 15:11:09 +01:00 |
|
|
|
db64781ffe
|
Removed stupid "unused" presentation logic method from Idea and created appropriate and reusable IColumn and IModel implementations instead.
|
2014-11-28 10:30:49 +01:00 |
|
fred-fri
|
9c8e92375d
|
activity thread bug
|
2014-11-28 17:49:47 +09:00 |
|
|
|
52805e3125
|
Removed a bunch of unnecessary NotificationSource parameters.
|
2014-11-27 16:50:30 +01:00 |
|
|
|
8c3a6b6f00
|
Removed absolute URL from notifications, they now always use the landing page and it is generated when required.
|
2014-11-27 16:03:50 +01:00 |
|
|
|
c59de3467e
|
Removed user notifications, they are now sent as straight e-mails.
|
2014-11-27 15:54:19 +01:00 |
|
fred-fri
|
ed775b1ba9
|
tests
|
2014-11-27 15:07:33 +09:00 |
|
fred-fri
|
8b0b277a2a
|
forum mail
|
2014-11-26 11:23:29 +09:00 |
|
fred-fri
|
5f194b9bc4
|
delete user
|
2014-11-25 14:56:45 +09:00 |
|
|
|
94a10a2b11
|
Activity templates and peer requests now have their checklists set to null by the database instead of manually in the code.
|
2014-11-24 16:32:05 +01:00 |
|
|
|
b31fdbfb07
|
Merge branch 'develop' into landing_page
Conflicts:
core/src/main/java/modules/CoreModule.java
|
2014-11-24 10:38:53 +01:00 |
|
fred-fri
|
e53fda6a8b
|
expand checklist overview
|
2014-11-24 16:41:06 +09:00 |
|
|
|
c181a72567
|
Moved group forum notifications to event based.
|
2014-11-21 15:29:21 +01:00 |
|
|
|
738f1f6403
|
Moved project forum notifications to event based.
|
2014-11-21 15:25:34 +01:00 |
|
|
|
d53dd6dbce
|
Moved ProjectFinalSeminarStatisticsService to the proper package and created its own filter instead of re-using the same one from ProjectService.
|
2014-11-21 11:13:29 +01:00 |
|
|
|
36e5e7090b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-21 11:00:36 +01:00 |
|
|
|
14c29dab16
|
Removed reference to checklist from project.
|
2014-11-21 11:00:31 +01:00 |
|
golrokh
|
747fe9cbc1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-21 10:45:09 +01:00 |
|
golrokh
|
ebb723c39f
|
start added for application period exemption
|
2014-11-21 10:43:19 +01:00 |
|
fred-fri
|
6aaebcdda8
|
Merge branch 'plugins' into develop
|
2014-11-21 18:09:54 +09:00 |
|
fred-fri
|
e3be8a3776
|
refactoring
|
2014-11-21 18:09:01 +09:00 |
|
golrokh
|
5f36ea6ddf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-21 09:59:12 +01:00 |
|
fred-fri
|
daf43b7a64
|
removing plugin stuff
|
2014-11-21 13:44:08 +09:00 |
|
|
|
5f480f2fa7
|
Augh Lombok.
|
2014-11-20 16:30:59 +01:00 |
|
|
|
bb3cd4443b
|
Migrated some final seminar related notifications to event based.
|
2014-11-20 16:28:10 +01:00 |
|
golrokh
|
2dad663c1e
|
start added for application period exemption
|
2014-11-20 15:49:19 +01:00 |
|
|
|
737d937ed1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-20 14:44:25 +01:00 |
|
|
|
f486a95bf0
|
Fixed so the milestone for final seminar thesis uploaded gets revoked when the thesis is deleted or the seminar is deleted.
A single event can now (de-)activate multiple milestones in the MilestoneActivator.
|
2014-11-20 14:44:17 +01:00 |
|
|
|
f8cce650f1
|
Fixed deletion of final seminar when activity final seminar plugin is enabled.
|
2014-11-20 14:33:56 +01:00 |
|
golrokh
|
dd9ef738ab
|
Project started instead of created
|
2014-11-20 14:01:55 +01:00 |
|
|
|
4221b08423
|
Refactored a bit.
|
2014-11-20 14:01:03 +01:00 |
|
|
|
29fd61aeaf
|
Changed map to foreach to signal that we're executing side-effects.
|
2014-11-20 13:49:54 +01:00 |
|
|
|
b31c07dfb8
|
Stupid workers.
|
2014-11-20 12:30:47 +01:00 |
|
|
|
2595ecbeda
|
Removed no longer necessary NotificationSourceURL.
|
2014-11-20 12:23:03 +01:00 |
|
|
|
94f24ff173
|
Moved NotificationModule to the Notification package.
|
2014-11-20 12:09:28 +01:00 |
|
|
|
dffb4cd664
|
Inlined URL service.
|
2014-11-20 11:24:11 +01:00 |
|
|
|
74f63f86e9
|
Notifications now use the new landing page.
|
2014-11-20 11:22:35 +01:00 |
|
|
|
10e8e536c0
|
Made sure there is always a trailing slash when asking for the base URL for the system.
|
2014-11-20 10:51:47 +01:00 |
|
