|
|
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 |
|
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 |
|
|
|
6758d3ad63
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-11 09:14:05 +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 |
|
|
|
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 |
|
|
|
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
|
8b2d88dd2f
|
shorter feedback
|
2014-11-10 15:40:20 +09:00 |
|
fred-fri
|
48d9ae92bf
|
removing logging
|
2014-11-10 14:44:20 +09:00 |
|
fred-fri
|
0988263cdd
|
removing logging
|
2014-11-10 14:25:56 +09:00 |
|
|
|
951ffa4253
|
Fixed "Supervisor" in role filter for supervisors "My projects" page.
|
2014-11-07 17:01:30 +01:00 |
|
|
|
7dc6cf25dc
|
Renamed Thread to ForumThread.
|
2014-11-07 16:49:31 +01:00 |
|
|
|
e40a2fd3c4
|
Moved reviewer interaction service to reviewer package.
|
2014-11-07 16:19:45 +01:00 |
|
|
|
c0386598c4
|
Merge remote-tracking branch 'origin/develop' into forum
|
2014-11-07 16:12:33 +01:00 |
|
|
|
e16de6f026
|
Landing pages for forum mail.
|
2014-11-07 15:39:56 +01:00 |
|
golrokh
|
eb6abfaf11
|
Merge remote-tracking branch 'origin/develop' into separateFinalSeminarAndRoughDraftEvents
Conflicts:
view/src/main/java/se/su/dsv/scipro/HomePage.java
|
2014-11-07 14:03:05 +01:00 |
|
golrokh
|
676852577f
|
Janne says not delete them
|
2014-11-07 13:27:10 +01:00 |
|
fred-fri
|
3844f4f43e
|
sonar
|
2014-11-07 17:58:01 +09:00 |
|
fred-fri
|
61f846a746
|
sonar
|
2014-11-07 17:57:02 +09:00 |
|
fred-fri
|
7ec270fae8
|
checklistdetails breaks something, commenting out temporarily
|
2014-11-07 16:59:09 +09:00 |
|
|
|
bb73d38a2f
|
Merge remote-tracking branch 'origin/develop' into forum
|
2014-11-07 08:44:04 +01:00 |
|
fred-fri
|
ad1f0fc721
|
sonar
|
2014-11-07 14:46:13 +09:00 |
|
fred-fri
|
1287f2a340
|
checklist overview panel
|
2014-11-07 14:46:02 +09:00 |
|
|
|
e4d43c04d6
|
Removed defunct test.
|
2014-11-06 17:02:50 +01:00 |
|
|
|
35ab6d3b35
|
Added notifications when messages are posted in reviewer interaction.
|
2014-11-06 17:02:28 +01:00 |
|
|
|
446398359c
|
Fixed missing id in test.
|
2014-11-06 15:25:30 +01:00 |
|
|
|
52996c9622
|
Merge remote-tracking branch 'origin/develop' into forum
Conflicts:
view/src/test/java/se/su/dsv/scipro/ForumMailPageTest.java
|
2014-11-06 15:14:42 +01:00 |
|
|
|
1b3c6e2b93
|
Added back surrogate key to ProjectThread.
|
2014-11-06 15:08:24 +01:00 |
|
|
|
604c4dc154
|
Renamed ForumThread to ProjectThread
|
2014-11-06 14:29:15 +01:00 |
|
|
|
99743d7f38
|
ForumThread uses composition over inheritance.
|
2014-11-06 14:07:13 +01:00 |
|
golrokh
|
f3cc57079d
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-06 13:59:25 +01:00 |
|
golrokh
|
86308ed2d0
|
Fixed tests
|
2014-11-06 13:58:45 +01:00 |
|
golrokh
|
14b76a39c6
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-06 11:30:48 +01:00 |
|
