4004 Commits

Author SHA1 Message Date
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
fred-fri
1e9d0ff233 removed incorrect group module 2014-07-09 11:42:36 +09:00
fred-fri
73e6d735d2 changing tests to conform with the new project argument 2014-07-08 18:41:28 +09:00
fred-fri
9b43e1d228 wicket wrapper for different service implementations that point to the project, group etc 2014-07-08 18:31:08 +09:00
fred-fri
e1fc99ead1 moving stuff 2014-07-08 17:05:07 +09:00
fred-fri
c4f9d7ef4c entities 2014-07-08 16:29:13 +09:00
fred-fri
51968465d6 entities 2014-07-08 14:39:44 +09:00
fred-fri
1b91cb5554 Group module 2014-07-07 12:15:35 +09:00
fred-fri
61957ab188 group forum entities 2014-07-02 17:19:52 +09:00
fred-fri
aa27870a3f removing remote export setting 2014-07-02 10:35:17 +09:00
fred-fri
9502592563 (s) replaced with s 2014-07-01 17:08:33 +09:00
fred-fri
808a4def90 refactor group gui 2014-07-01 11:32:21 +09:00
fred-fri
334568784b student group pages, filtering out relevant groups rather than showing all 2014-06-30 14:22:43 +09:00
fred-fri
0ca05bb54a lots of refactoring 2014-06-27 15:44:22 +09:00
fred-fri
97eb94c68c refactoring away bad panel 2014-06-26 17:35:49 +09:00
fred-fri
eb9bb141ba validation 2014-06-26 16:15:50 +09:00
fred-fri
6796b9651f preliminary grading report only one criteria must have been filled out 2014-06-26 11:02:55 +09:00
fred-fri
a229f33a19 manual adding of active participants to final seminars 2014-06-25 15:39:40 +09:00
fred-fri
db982e9595 refactoring group stuff 2014-06-24 11:16:54 +09:00
Golrokh Moattar
18c4b24fbc continue with group creation 2014-06-23 16:09:22 +02:00
693d99caeb Admin page to manage languages. 2014-06-19 08:34:05 +02:00
12e1e4d728 Fixed QClass reference after having renamed Language2 2014-06-18 17:02:46 +02:00
e7855907c2 Removed unnecessary annotation. 2014-06-18 16:29:38 +02:00