|
|
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 |
|
|
|
8fc9be2a05
|
RejectFinalThesisPanel does not belong in the forum package.
|
2014-07-09 15:56:54 +02:00 |
|
|
|
bb82cf82c5
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 15:55:15 +02:00 |
|
|
|
c63e3e3eb5
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 15:35:29 +02:00 |
|
|
|
f876740203
|
Formatting.
|
2014-07-09 15:13:26 +02:00 |
|
|
|
9bed9af96b
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 14:59:56 +02:00 |
|
|
|
8755343dcf
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 14:45:48 +02:00 |
|
|
|
71bdddfe6d
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 14:44:02 +02:00 |
|
|
|
00b3b72ce0
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 14:41:40 +02:00 |
|
|
|
a163f2300c
|
Organizing forum pages/panels in threaded/un-threaded so there is some sanity to the madness.
|
2014-07-09 14:40:01 +02:00 |
|
|
|
5cea5b9903
|
Refactored out problematic reference to Project in ViewForumThreadPanel.
|
2014-07-09 14:29:11 +02:00 |
|
|
|
26d0e72de7
|
Made it compile.
|
2014-07-09 11:17:53 +02:00 |
|
|
|
49d4ddccb1
|
Renamed FinalSeminarApprovalDecisionPage to ReviewerApprovalDecisionPage.
|
2014-07-09 10:44:06 +02:00 |
|
|
|
31b6ee4287
|
Removed role from forum post panel.
|
2014-07-09 10:35:33 +02:00 |
|
|
|
33245272e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-07-09 10:12:55 +02:00 |
|
fred-fri
|
bec32e562e
|
removing last modified from group details panel
|
2014-07-09 17:11:58 +09:00 |
|
fred-fri
|
3151adf4dc
|
bug fix
|
2014-07-09 17:10:45 +09:00 |
|
fred-fri
|
263c1befe1
|
gui for system modules
|
2014-07-09 16:47:51 +09: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
|
66080c9fd6
|
test fix
|
2014-07-09 15:35:03 +09:00 |
|
fred-fri
|
6b48f7f914
|
adding system modules, group module
|
2014-07-09 14:59:01 +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 |
|
|
|
915b38e690
|
Fixed unchecked warning.
|
2014-07-08 15:50:12 +02:00 |
|
fred-fri
|
5e4a56482a
|
submitforumthreadpanel and submitforumreplypanel generified
|
2014-07-08 20:07:42 +09:00 |
|
fred-fri
|
cc0e21214c
|
conform to new argument project
|
2014-07-08 19:52:42 +09:00 |
|
fred-fri
|
966743b652
|
moving wrapper argument last
|
2014-07-08 19:35:49 +09:00 |
|
fred-fri
|
30e017ff2c
|
conform to new argument project
|
2014-07-08 19:22:52 +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 |
|
|
|
a05b514621
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-07-07 09:25:28 +02:00 |
|
fred-fri
|
ea5a3c2511
|
typo
|
2014-07-07 15:45:42 +09:00 |
|
fred-fri
|
37c37618dd
|
test fix
|
2014-07-07 15:38:31 +09:00 |
|
fred-fri
|
9713c92649
|
improved feedback at user edit
|
2014-07-07 15:26:18 +09:00 |
|
fred-fri
|
3265083cc3
|
added date
|
2014-07-07 12:59:01 +09:00 |
|
fred-fri
|
1b91cb5554
|
Group module
|
2014-07-07 12:15:35 +09:00 |
|
fred-fri
|
b9b88e98ca
|
Merge branch 'separate' into develop
|
2014-07-07 11:06:09 +09:00 |
|
fred-fri
|
836e0bac42
|
changed turnitin api url
|
2014-07-07 11:05:56 +09:00 |
|
fred-fri
|
71f0ac9e5f
|
supervisor page
|
2014-07-03 15:07:39 +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
|
a3b39f2547
|
added last modified date
|
2014-07-02 10:13:30 +09:00 |
|
fred-fri
|
9502592563
|
(s) replaced with s
|
2014-07-01 17:08:33 +09:00 |
|
fred-fri
|
851991f6ef
|
more space in footer form
|
2014-07-01 13:02:19 +09:00 |
|
fred-fri
|
4073eb0ee1
|
clarifying
|
2014-07-01 11:41:31 +09:00 |
|
