fred-fri
|
280adb1f57
|
change no
|
2014-07-28 17:58:18 +09:00 |
|
fred-fri
|
569d8a23ee
|
cleanup
|
2014-07-28 17:53:07 +09:00 |
|
fred-fri
|
9e6a15ef07
|
cleanup
|
2014-07-28 17:48:21 +09:00 |
|
fred-fri
|
27a4fa8e45
|
removing unnecessary stuff
|
2014-07-28 17:37:23 +09:00 |
|
fred-fri
|
3423189a1d
|
adding stuff into turnitinsettings class and removing it from elsewhere (turnitinmodule properties should go too but leaving them for now)
|
2014-07-28 11:54:22 +09:00 |
|
|
|
606569005e
|
Merge branch 'develop' into hashuser
|
2014-07-25 16:03:19 +02:00 |
|
Emil Siverhall
|
4c2699e062
|
fixed broken getAllActivities for milestone statistics
|
2014-07-25 09:30:13 +02:00 |
|
fred-fri
|
2d9bc914d9
|
delete all users hashes when setting password
|
2014-07-25 08:15:54 +09:00 |
|
Emil Siverhall
|
b24d66992e
|
added filtering on projects in group to findAll + test coverage for service impl
|
2014-07-24 13:03:18 +02:00 |
|
fred-fri
|
b2816f7ad7
|
user who requests new password gets notification
|
2014-07-24 11:27:53 +09:00 |
|
fred-fri
|
0cef4685da
|
refactoring
|
2014-07-24 10:48:26 +09:00 |
|
fred-fri
|
02c06d6f02
|
refactoring
|
2014-07-24 10:28:23 +09:00 |
|
fred-fri
|
a27c7f72a6
|
removed user details from notification, some cleanup
|
2014-07-24 09:59:01 +09:00 |
|
fred-fri
|
e9737b0fd6
|
nicer notification
|
2014-07-24 09:48:40 +09:00 |
|
fred-fri
|
d745aaf35f
|
removing test line
|
2014-07-24 07:18:53 +09:00 |
|
fred-fri
|
a9ac34f2a8
|
error fix, column was missing
|
2014-07-24 07:17:55 +09:00 |
|
Emil Siverhall
|
2039745764
|
changed implementation
|
2014-07-23 16:00:13 +02:00 |
|
Emil Siverhall
|
b734431bbb
|
Ideas only visible for authors if any active project type have it switched on
|
2014-07-23 15:00:19 +02:00 |
|
fred-fri
|
c9acdbc689
|
hooking up notification, error
|
2014-07-23 15:14:33 +09:00 |
|
fred-fri
|
0488b38d5f
|
creating and saving hash when admin creates user (but not when admin merely edits)
|
2014-07-23 12:04:19 +09:00 |
|
fred-fri
|
d3ec278710
|
adding notifications for user created, user change password and user password changed
|
2014-07-23 10:30:38 +09:00 |
|
fred-fri
|
43abc2d54f
|
adding hash service
|
2014-07-23 09:31:19 +09:00 |
|
fred-fri
|
ad343bbaf8
|
adding hash class
|
2014-07-23 09:10:20 +09:00 |
|
Emil Siverhall
|
c508a8fb51
|
keyword <-> research area connection bugs
|
2014-07-16 12:39:00 +02:00 |
|
Emil Siverhall
|
09e7626154
|
reviewing service test coverage
|
2014-07-16 09:58:46 +02:00 |
|
Emil Siverhall
|
d11c1617d3
|
sonar issues
|
2014-07-15 14:12:12 +02:00 |
|
Emil Siverhall
|
5ae0fe3fc2
|
fixed module ordering
|
2014-07-15 10:55:46 +02:00 |
|
Emil Siverhall
|
4302a1de56
|
mail notification formatting and correct redirect page to go straight to the message threads
|
2014-07-15 09:31:17 +02:00 |
|
Emil Siverhall
|
5c547980fa
|
more work for group event notifications
|
2014-07-14 16:30:39 +02:00 |
|
Emil Siverhall
|
d1529b06a9
|
GroupEvent for group notifications
|
2014-07-14 15:40:41 +02:00 |
|
|
|
8eb0dcd970
|
Suppressed warnings due to Lombok.
|
2014-07-11 16:01:38 +02:00 |
|
|
|
f2e62676e9
|
Sonar fixes: removed unused field.
|
2014-07-11 15:44:03 +02:00 |
|
|
|
2167f988c6
|
Re-ordered system modules
|
2014-07-11 13:41:39 +02:00 |
|
fred-fri
|
5956b94c60
|
Merge remote-tracking branch 'private/threadurl' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumThreadOverviewPanel.java
|
2014-07-11 18:17:39 +09:00 |
|
fred-fri
|
e39f6f7db5
|
pageparameterkeys doesnt need to contain forumthread (ftid), groupthread (gtid) and thread (tid), thread (tid) is enough
|
2014-07-11 17:59:15 +09:00 |
|
|
|
1cd5213093
|
Removed unused parameters.
|
2014-07-11 09:50:19 +02:00 |
|
|
|
924f095b03
|
Removed commented out code.
|
2014-07-11 09:47:20 +02:00 |
|
fred-fri
|
70d36ac2b5
|
fixing urls and corresponding notifications
|
2014-07-11 15:37:40 +09:00 |
|
|
|
c11ebe849c
|
Fixed thread overview for students.
|
2014-07-10 15:39:04 +02:00 |
|
|
|
c75eed301c
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/util/PageParameterKeys.java
|
2014-07-10 10:39:18 +02:00 |
|
fred-fri
|
fde79ced3d
|
supervisor can now view all threads (but not open)
|
2014-07-10 17:24:05 +09:00 |
|
fred-fri
|
b4c21c2821
|
new basicforumservice which generifies project and group forum services
|
2014-07-10 16:50:41 +09:00 |
|
|
|
6a63c34d42
|
Moved isAuthorInGroup to isAuthor in Group class instead.
|
2014-07-10 09:13:28 +02:00 |
|
fred-fri
|
f4823a509b
|
supervisor can create group threads. notification methods use project events (this should probably change to new group events) and are not implemented. showing threads and posts is not implemented.
|
2014-07-10 15:22:13 +09:00 |
|
|
|
418494b996
|
Hopefully improved flakey test by using the reference returned by save(E) instead of relying on an old reference being updated. (Yay side-effects)
|
2014-07-09 17:00:51 +02:00 |
|
|
|
6647b80972
|
Fixed SQL migration name conflict after merge.
|
2014-07-09 16:53:26 +02:00 |
|
|
|
592fa3ddd4
|
Merge branch 'group_forum' into develop
Conflicts:
core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/forum/pages/SupervisorForumBasePage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
|
2014-07-09 16:50:53 +02:00 |
|
fred-fri
|
6562843909
|
sql improvements
|
2014-07-09 16:41:38 +09:00 |
|
fred-fri
|
b1af5ccea4
|
renaming modules
|
2014-07-09 16:30:53 +09:00 |
|
fred-fri
|
62b079381b
|
adding system modules, group module
|
2014-07-09 14:00:01 +09:00 |
|
