3962 Commits

Author SHA1 Message Date
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
838018ea5d "User redirection"... Why was this implemented as notifications? 2014-11-19 15:30:01 +01:00
764e533902 Made the return type more specific. 2014-11-19 14:49:16 +01:00
e3f2c59ab3 Added implementation for NotificationEventService. 2014-11-19 13:31:16 +01:00
8e444a4e54 Merge branch 'develop' into landing_page 2014-11-19 10:59:51 +01:00
37a83be7e5 FP wins. 2014-11-19 10:55:11 +01:00
822fa07809 Merge remote-tracking branch 'origin/develop' into develop 2014-11-19 10:11:50 +01:00
fred-fri
b5404860a3 more markup. the markup is a bit all over the place and doesnt gracefully tolerate small screen sizes, but its tricky to do much better because of the hierarchy of the components.
also removing old tests.
2014-11-19 14:22:26 +09:00
fred-fri
3fe66b9979 refactoring edit checklist template 2014-11-19 11:18:01 +09:00
fred-fri
0e72be8512 must remove both notifications and notificationdata. editing the file because it doesnt appear to have been run on any servers yet so it should be ok. 2014-11-19 09:16:40 +09:00
golrokh
f66dad8d38 sql query for deleting faulty notifications 2014-11-18 10:05:15 +01:00
b01d3e403d Removed unused field. 2014-11-18 09:30:45 +01:00
974dc57602 Removed old column that prevented forum from working when the forum mails were enabled. 2014-11-17 09:49:50 +01:00
golrokh
3980aaaf18 sql query for updating decision notifications 2014-11-17 09:40:42 +01:00
fred-fri
c3ffa3a58b sending to mail page 2014-11-17 12:49:10 +09:00
fred-fri
aec56295a2 merge and remove page 2014-11-17 11:07:58 +09:00
fred-fri
67eaae9345 merge 2014-11-17 10:50:04 +09:00
fred-fri
984742a586 test fix 2014-11-14 16:27:30 +09:00