|
|
16dd1bc087
|
Deleted stupid crap.
|
2014-12-08 16:32:45 +01:00 |
|
|
|
3bbfc82b97
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-08 15:34:02 +01:00 |
|
|
|
15e7df0ef9
|
Fixed test.
|
2014-12-08 15:33:53 +01:00 |
|
golrokh
|
92ea49e62d
|
public page for listing active projects
|
2014-12-08 15:18:55 +01:00 |
|
golrokh
|
2e80f41c25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-08 14:19:34 +01:00 |
|
|
|
f504398bd7
|
Stuff is immutable you know.
|
2014-12-08 14:14:22 +01:00 |
|
|
|
93a885e4d8
|
Fixed so that forum mails fetch the correct entity and redirects the user correctly.
|
2014-12-08 14:12:59 +01:00 |
|
|
|
1334cd8202
|
Changed some texts.
|
2014-12-08 14:00:16 +01:00 |
|
golrokh
|
a204d1fb0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-08 13:45:25 +01:00 |
|
golrokh
|
4f6c87fb3c
|
Final Seminar Opposition: Point and Motivation should be visible even if not approved
|
2014-12-08 13:44:46 +01:00 |
|
|
|
f27e7e1760
|
Removed reference to deleted NotificationUtils
|
2014-12-08 13:20:55 +01:00 |
|
|
|
7d41e5e7a9
|
Fixed SQL migration version conflict.
|
2014-12-08 13:20:12 +01:00 |
|
|
|
f142f87be6
|
Merge branch 'notification_cleaning_after_landing_page' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/forum/GroupForumService.java
core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
view/src/main/java/se/su/dsv/scipro/forum/ProjectForum.java
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/CreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/forum/panels/unthreaded/GradingCreateForumThreadPanel.java
view/src/main/java/se/su/dsv/scipro/group/GroupForum.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
view/src/test/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumReplyPanelTest.java
view/src/test/java/se/su/dsv/scipro/forum/panels/threaded/SubmitForumThreadPanelTest.java
|
2014-12-08 13:19:10 +01:00 |
|
|
|
e7bcaa90e4
|
Fixed version conflict in SQL migrations.
|
2014-12-08 13:06:55 +01:00 |
|
|
|
db0c5279b0
|
Merge remote-tracking branch 'origin/develop' into user_events
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ProjectForumThread.java
view/src/main/java/se/su/dsv/scipro/group/GroupForumThread.java
|
2014-12-08 13:06:35 +01:00 |
|
|
|
6839ebc3e8
|
Removed Membership interface.
|
2014-12-08 13:01:59 +01:00 |
|
|
|
03b1b95e3a
|
Removed old notification landing pages.
|
2014-12-08 13:00:17 +01:00 |
|
|
|
0b326c3396
|
Deleted unused methods.
|
2014-12-08 12:41:08 +01:00 |
|
|
|
f33cf1eb08
|
Improved some types to signal that they may not return a value rather than throwing an exception.
|
2014-12-08 12:40:11 +01:00 |
|
|
|
45b4067e55
|
Merge remote-tracking branch 'origin/develop' into import
|
2014-12-08 12:24:36 +01:00 |
|
|
|
1139bd1f4f
|
Why was this converted to use an iterator?
|
2014-12-08 12:23:40 +01:00 |
|
|
|
f21ad0f4ed
|
Fixed grade calculation on the reviewer grading report PDF.
It used to display the supervisors grade and ignore the reviewers assessment.
|
2014-12-08 09:48:57 +01:00 |
|
|
|
a1c63dcf2e
|
Renamed field so it does not get shadowed.
|
2014-12-05 09:26:20 +01:00 |
|
fred-fri
|
f5d8b85f86
|
public file page
|
2014-12-05 10:05:18 +09:00 |
|
|
|
3bcaf67baa
|
So tired of this shit...
|
2014-12-04 18:20:53 +01:00 |
|
golrokh
|
3c324cfe4c
|
better code for showing number of unread supervisor interaction posts in reviewer page
|
2014-12-04 12:54:29 +01:00 |
|
|
|
57122c3245
|
Show the date the grade was reported in the supervisor overview.
|
2014-12-04 10:58:24 +01:00 |
|
golrokh
|
b0b97bd7f4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-03 15:33:23 +01:00 |
|
golrokh
|
f19298fbbd
|
Added a new column to see number of unread posts for every individual project in reviewPage
|
2014-12-03 15:32:52 +01:00 |
|
golrokh
|
34d4abce66
|
test method for viewing number of unread supervisor posts
|
2014-12-03 14:55:47 +01:00 |
|
golrokh
|
c957466292
|
1- Set ForumPosts read when user views the thread.
2- Added a badge with total number of unread interaction with posts on reviewPage
|
2014-12-03 14:46:12 +01:00 |
|
|
|
d8a65e9b48
|
Removed unused class.
|
2014-12-03 13:12:36 +01:00 |
|
|
|
59742d37f5
|
Sonar.
|
2014-12-03 10:09:25 +01:00 |
|
|
|
92b620ce69
|
Fixed lazy exception when opening user profile dialogs in the group details dialog.
|
2014-12-03 10:00:44 +01:00 |
|
fred-fri
|
e0862f8ca9
|
import
|
2014-12-03 10:51:19 +09:00 |
|
fred-fri
|
84a9b260bb
|
fenced feedback panel
|
2014-12-03 09:58:52 +09:00 |
|
golrokh
|
364ce4a075
|
public var. converted to local var.
|
2014-12-02 15:06:51 +01:00 |
|
golrokh
|
ad24796255
|
Deleted the word "Rwanda" from related class names
|
2014-12-02 14:53:36 +01:00 |
|
golrokh
|
13ba34cb2f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-12-02 13:44:24 +01:00 |
|
|
|
f75e40ccd7
|
Fixed lazy exception when opening user profile dialogs in the add multiple user panel.
This class sucks and is the embodiment of evil stateful yuck.
|
2014-12-02 13:44:05 +01:00 |
|
golrokh
|
697cca2849
|
added number of unread posts' badge in interact with supervisor tab
|
2014-12-02 13:31:22 +01:00 |
|
|
|
563cbc3780
|
Fixed potential lazy exception (could not reproduce myself).
|
2014-12-02 13:18:32 +01:00 |
|
fred-fri
|
884322dd46
|
Merge branch 'grade' into develop
|
2014-12-02 19:13:09 +09:00 |
|
fred-fri
|
a0b59657ec
|
Merge remote-tracking branch 'origin/develop' into grade
|
2014-12-02 19:12:19 +09:00 |
|
fred-fri
|
01c64a57f7
|
grade statistics
|
2014-12-02 19:11:57 +09:00 |
|
golrokh
|
a2bdb1a4c1
|
Set cancel = false when move final seminar
|
2014-12-02 11:03:56 +01:00 |
|
fred-fri
|
41724dca56
|
points instead of radios
|
2014-12-02 17:30:17 +09:00 |
|
fred-fri
|
ff27c4672b
|
clarifying
|
2014-12-02 16:01:08 +09:00 |
|
fred-fri
|
41b5b3f172
|
dont know how to implement provider
|
2014-12-02 15:56:00 +09:00 |
|
|
|
ba884932ca
|
Mocks ftw...
release-2014-12-01_22-46-42
|
2014-12-01 16:01:12 +01:00 |
|
