|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
c0386598c4
|
Merge remote-tracking branch 'origin/develop' into forum
|
2014-11-07 16:12:33 +01:00 |
|
|
|
6958e6872b
|
Fixed some Scala compilation errors.
|
2014-11-07 15:52:51 +01:00 |
|
|
|
e16de6f026
|
Landing pages for forum mail.
|
2014-11-07 15:39:56 +01:00 |
|
|
|
8b66cbf717
|
Fixed @JoinColumn name
|
2014-11-07 15:27:29 +01:00 |
|
golrokh
|
9859c8bc56
|
sql for updating old thesis event
|
2014-11-07 15:27:23 +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 |
|
|
|
e11b4ef3a5
|
Reading forum mail now posts using the correct service.
|
2014-11-07 13:12:23 +01:00 |
|
|
|
af38c9b0e3
|
Added URL to forum mails.
|
2014-11-07 13:03:19 +01:00 |
|
|
|
9971d0bf28
|
Fixed sending of forum mail for the group forum.
|
2014-11-07 12:18:01 +01:00 |
|
|
|
974d98fc80
|
Fixed sending of forum mail for the project forum.
|
2014-11-07 11:45:59 +01:00 |
|
|
|
a8ffa4de86
|
Delomboking.
|
2014-11-07 10:56:58 +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 |
|
|
|
c30a92a625
|
Fixed migration version conflict.
|
2014-11-06 16:20:28 +01:00 |
|
|
|
41849eb7ba
|
Sends out event when a message is posted in the reviewer interaction.
|
2014-11-06 16:14:15 +01:00 |
|
golrokh
|
63058a7c32
|
change the old event type names to new ones
|
2014-11-06 16:03:37 +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 |
|
|
|
43b4271929
|
Added back surrogate key to GroupThread.
|
2014-11-06 15:12:28 +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 |
|
|
|
899325f981
|
Ops. Never meant to commit that.
|
2014-11-06 14:14:39 +01:00 |
|
|
|
c700c66c1d
|
Deleted ProjectThread.
|
2014-11-06 14:14:18 +01:00 |
|
|
|
368a442408
|
Fixed warning.
|
2014-11-06 14:07:19 +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
release-2014-11-07_00-19-08
|
2014-11-06 13:58:45 +01:00 |
|
golrokh
|
14b76a39c6
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-06 11:30:48 +01:00 |
|
golrokh
|
8607f7127d
|
fixed ul li style in header
|
2014-11-06 11:29:29 +01:00 |
|
golrokh
|
826e318fc2
|
The last selected role saved and returned and the next login
|
2014-11-06 11:23:40 +01:00 |
|
golrokh
|
49fb7b61ac
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-06 10:40:05 +01:00 |
|
fred-fri
|
ab8332bb40
|
adding primary key
|
2014-11-06 12:50:38 +09:00 |
|
|
|
f2f017886b
|
Reviewer thread uses composition over inheritance.
|
2014-11-05 16:22:02 +01:00 |
|
golrokh
|
d712ae09e5
|
The latest selected role will be saved in db + roles menu changed to DDL
|
2014-11-05 16:06:05 +01:00 |
|
