|
|
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 |
|
|
|
7139658037
|
Changed to a property model.
|
2014-11-21 09:24:12 +01:00 |
|
fred-fri
|
daf43b7a64
|
removing plugin stuff
|
2014-11-21 13:44:08 +09:00 |
|
fred-fri
|
64fd784ea1
|
complete refactoring of language page
|
2014-11-21 11:34:29 +09:00 |
|
fred-fri
|
da3341e884
|
this accomplishes nothing
|
2014-11-21 10:58:53 +09:00 |
|
fred-fri
|
479bbd4b82
|
refactoring
|
2014-11-21 10:34:35 +09:00 |
|
fred-fri
|
485d47b6f7
|
refactoring
|
2014-11-21 10:32:56 +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 |
|
|
|
af27641c9e
|
Fixed sorting of forum threads.
|
2014-11-20 15:41:43 +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
|
3b74b60968
|
Project started between instead of created between
|
2014-11-20 14:06:12 +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 |
|
|
|
ec2f67a5c3
|
Merge branch 'develop' into landing_page
|
2014-11-20 12:40:28 +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 |
|
golrokh
|
3b2dbd1e80
|
Total questions in Checklist overview
|
2014-11-20 10:48:23 +01:00 |
|
|
|
4f2858352f
|
Notifications are now marked read when using the landing page.
|
2014-11-20 10:42:33 +01:00 |
|
|
|
76fb28118f
|
Changed notification data panel to use the new notification landing page.
|
2014-11-20 10:32:46 +01:00 |
|
|
|
bff9e1f0ca
|
Implemented idea notification redirection.
|
2014-11-20 10:13:38 +01:00 |
|
|
|
d6470ebcdb
|
Implemented milestone notification redirection.
|
2014-11-20 10:03:26 +01:00 |
|
|
|
8823664086
|
Changed project forum notifications to only redirect to the project forum overview page instead of specific threads since there is no way to do that at the moment.
|
2014-11-20 09:58:05 +01:00 |
|
|
|
af53b60af0
|
Changed group notifications to only redirect to the group overview page instead of specific thread since there is no way to do that at the moment.
|
2014-11-20 09:56:11 +01:00 |
|
|
|
a4a7558c22
|
Implemented final seminar redirection.
|
2014-11-20 09:53:55 +01:00 |
|
fred-fri
|
8db9a3f345
|
clean
|
2014-11-20 16:49:57 +09:00 |
|
fred-fri
|
c5901ec58d
|
moving and iffing stuff related to reports in order for final seminars not to crash when grading module is off
|
2014-11-20 16:46:26 +09:00 |
|
fred-fri
|
6d5f2b0e2e
|
we dont need to know a user deletion attempt failed, all it does is spam the log
|
2014-11-20 11:29:28 +09:00 |
|
fred-fri
|
00617a0e42
|
stahp letting users try to remove languages
|
2014-11-20 11:25:53 +09:00 |
|
fred-fri
|
70407fc936
|
stahp letting users try to remove languages
|
2014-11-20 11:25:26 +09:00 |
|
golrokh
|
4e779b6ebe
|
Show question in checklist popup
|
2014-11-19 15:35:50 +01:00 |
|
