3995 Commits

Author SHA1 Message Date
b306ab39e4 Removed unused idea notification PARTNER_TIMEOUT. 2014-12-17 15:13:36 +01:00
eccf913543 Removed unused notification event configuration (was for editable descriptions). 2014-12-17 15:11:48 +01:00
dd02ff3970 Removed unused idea-related notification events. 2014-12-17 15:09:56 +01:00
8b44b533e2 Cleaned up some old configuration relating to the deleted Turnitin error notification. 2014-12-17 15:05:42 +01:00
dfd2826f6c Removed unused seminar notification event. 2014-12-17 14:48:02 +01:00
3665427c0f Removed unnecessary local variable. 2014-12-17 09:32:50 +01:00
fc581f1723 Used the proper method instead of the stupid one. 2014-12-12 11:23:57 +01:00
debd6adeab Tested adding default activity plan when project gets started from an idea. 2014-12-12 11:21:26 +01:00
ff7e8c2479 This is the method that every consumer wants. 2014-12-12 10:58:27 +01:00
5d0ad7417b Added mock implementations of EventBus and ActivityPlanFacade to the test match module. 2014-12-12 10:50:40 +01:00
5ca59d2828 Delomboked for Scala compatibility. 2014-12-12 10:40:29 +01:00
5914b61067 Removed dependency on match module from activity plan, the dependency should go the other way around. 2014-12-12 10:30:58 +01:00
golrokh
261914e85b change the length of source in NotificationData to LONGTEXT 2014-12-10 10:55:19 +01:00
16dd1bc087 Deleted stupid crap. 2014-12-08 16:32:45 +01:00
15e7df0ef9 Fixed test. 2014-12-08 15:33:53 +01:00
f504398bd7 Stuff is immutable you know. 2014-12-08 14:14:22 +01:00
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