|
|
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 |
|
fred-fri
|
85ce083c4a
|
user profile notifications setting whether to receive forum mails
|
2014-11-14 16:18:51 +09:00 |
|
fred-fri
|
612db084d8
|
fixing notes
|
2014-11-14 10:44:10 +09:00 |
|
golrokh
|
e47676f005
|
fixed the wrong sql query
|
2014-11-13 13:44:51 +01:00 |
|
golrokh
|
65d478db06
|
changes back in the sql query which seems wrong
|
2014-11-13 13:09:43 +01:00 |
|
golrokh
|
7a3af8935c
|
fixed the wrong sql query
|
2014-11-13 10:32:14 +01:00 |
|
fred-fri
|
eb748d9a8b
|
refactoring
|
2014-11-13 14:38:07 +09:00 |
|
fred-fri
|
478bea1fdb
|
notification fix
|
2014-11-13 11:48:37 +09:00 |
|
fred-fri
|
011147ea6f
|
test fixes
|
2014-11-13 11:35:28 +09:00 |
|
fred-fri
|
6de8b48673
|
test fix
|
2014-11-13 11:32:18 +09:00 |
|
fred-fri
|
e0b75c961b
|
more filtering
|
2014-11-12 18:26:28 +09:00 |
|
|
|
7b57c9a023
|
Yuck un-threaded forum.
|
2014-11-11 16:39:51 +01:00 |
|
golrokh
|
e52cd97e5c
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-11 14:08:32 +01:00 |
|
golrokh
|
5db9a34418
|
sql for updating old thesis event
|
2014-11-11 13:55:59 +01:00 |
|
|
|
714e19b0ea
|
Converted unnecessary DataView to simpler ListView (there was no paging and Long.MAX_VALUE threads per page).
|
2014-11-11 13:26:39 +01:00 |
|
golrokh
|
1a78389145
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
Conflicts:
core/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
core/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java
view/src/main/java/se/su/dsv/scipro/landingpages/ProjectLandingPage.java
|
2014-11-11 11:31:49 +01:00 |
|
golrokh
|
af2f9af175
|
sql for updating old thesis event
|
2014-11-11 11:22:38 +01:00 |
|
|
|
11c4f8492e
|
More tests.
|
2014-11-11 10:52:31 +01:00 |
|
|
|
d9032a1e04
|
More tests.
|
2014-11-11 10:04:29 +01:00 |
|
|
|
d541c32aeb
|
This has to go.
|
2014-11-11 10:02:46 +01:00 |
|
|
|
5dbaeea84b
|
Removed unused code.
|
2014-11-11 09:28:13 +01:00 |
|
|
|
5ecf5a3797
|
Fixed migration version conflicts.
|
2014-11-11 09:13:26 +01:00 |
|
|
|
b5ef548834
|
Merge branch 'develop' into forum
|
2014-11-11 09:04:18 +01:00 |
|
fred-fri
|
7f8f923ff4
|
removing plugins
|
2014-11-11 16:04:00 +09:00 |
|
|
|
ff4768e8b5
|
Simplified.
|
2014-11-10 14:39:12 +01:00 |
|
|
|
2d29845b9e
|
Project (de-)activated notifications are now sent by listening to their respective events.
|
2014-11-10 13:30:43 +01:00 |
|
|
|
7f288d28ed
|
ProjectServiceImpl sends out event when project gets (de-)activated.
|
2014-11-10 13:17:15 +01:00 |
|
|
|
4de9e9b070
|
ProjectService now delegates to repo when saving.
|
2014-11-10 13:11:47 +01:00 |
|
|
|
8b44380efa
|
Refactored.
Notifications when (de-)activating projects now use landing page (overview of said project).
|
2014-11-10 13:07:03 +01:00 |
|
|
|
47d900883f
|
Removed outwards dependencies from system package by adding foreign key cascading instead.
|
2014-11-10 12:58:22 +01:00 |
|
fred-fri
|
c451654b52
|
checklist overview
|
2014-11-10 19:32:09 +09:00 |
|
|
|
4fb3fd8814
|
Optimized some queries.
|
2014-11-10 11:26:09 +01:00 |
|
|
|
b74688da38
|
Merge remote-tracking branch 'origin/develop' into forum
Conflicts:
core/src/main/java/se/su/dsv/scipro/forummail/ForumMailFormatterImpl.java
|
2014-11-10 10:54:06 +01:00 |
|
fred-fri
|
f05d211006
|
first meeting fix
|
2014-11-10 16:05:19 +09:00 |
|
fred-fri
|
0988263cdd
|
removing logging
|
2014-11-10 14:25:56 +09:00 |
|
|
|
7dc6cf25dc
|
Renamed Thread to ForumThread.
|
2014-11-07 16:49:31 +01:00 |
|
|
|
831dd95a64
|
Added missing @GeneratedValue
|
2014-11-07 16:45:03 +01:00 |
|
|
|
e40a2fd3c4
|
Moved reviewer interaction service to reviewer package.
|
2014-11-07 16:19:45 +01:00 |
|
|
|
6958e6872b
|
Fixed some Scala compilation errors.
|
2014-11-07 15:52:51 +01:00 |
|
