17495 Commits

Author SHA1 Message Date
fred-fri
ac9c4ce547 system template 2014-11-13 12:54:50 +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
fred-fri
927f063169 more cleaning 2014-11-12 15:34:07 +09:00
fred-fri
e6cc63b188 cleaning 2014-11-12 15:13:27 +09:00
fred-fri
6e62cdfdd0 moving form 2014-11-12 14:53:01 +09:00
fred-fri
c78d26c573 copy to clipboard 2014-11-12 14:26:23 +09:00
fred-fri
11f30a73f5 refactor mail panel, selection of recipients more granular 2014-11-12 12:07:31 +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
51334357c5 Merge remote-tracking branch 'origin/develop' into develop 2014-11-11 13:26:44 +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
d793ce1596 Renamed ForumThreadProvider to ProjectThreadProvider since that is what it is. 2014-11-11 12:36:38 +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
fred-fri
f90e1865fd Merge remote-tracking branch 'origin/develop' into develop 2014-11-11 17:40:49 +09:00
fred-fri
c5279f93aa removed default "chart title" 2014-11-11 17:40:35 +09:00
5dbaeea84b Removed unused code. 2014-11-11 09:28:13 +01:00
6758d3ad63 Merge remote-tracking branch 'origin/develop' into develop 2014-11-11 09:14:05 +01:00
5ecf5a3797 Fixed migration version conflicts. 2014-11-11 09:13:26 +01:00
fred-fri
8988d9273d markup fixes 2014-11-11 17:07:59 +09:00
b5ef548834 Merge branch 'develop' into forum 2014-11-11 09:04:18 +01:00
fred-fri
7e1ae65c8f mail page fixes 2014-11-11 16:41:25 +09:00
fred-fri
f792677817 reset sorting 2014-11-11 16:27:18 +09:00
fred-fri
33f486095d not always sys admin for users who have the role, but only when template is created in the admin interface 2014-11-11 16:18:23 +09:00
fred-fri
10c82390df book a room 2014-11-11 16:06:50 +09:00
fred-fri
7f8f923ff4 removing plugins 2014-11-11 16:04:00 +09:00
fred-fri
0db682c32e date fix 2014-11-11 15:13:29 +09:00
fred-fri
91a6e36748 visibility fix 2014-11-11 14:19:34 +09:00
fred-fri
65a423c09f chart improvements 2014-11-11 11:33:53 +09:00
02ad3dcb0c Yeah 2014-11-10 16:53:51 +01: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
bbafd42b91 Removed unused field. 2014-11-10 11:44:55 +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
d0ff8510c3 Merge remote-tracking branch 'origin/develop' into develop 2014-11-10 10:57:35 +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
8b2d88dd2f shorter feedback 2014-11-10 15:40:20 +09:00