leosu
|
1ca0dbda4d
|
fixed string
|
2014-03-19 16:22:44 +01:00 |
|
leosu
|
b97fa6ecea
|
pleasing sonar
|
2014-03-19 15:56:47 +01:00 |
|
Golrokh Moattar
|
b3c1d9825e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 15:41:40 +01:00 |
|
Golrokh Moattar
|
68b8ba4489
|
Removed unused Repo and fixed related Service
|
2014-03-19 15:26:32 +01:00 |
|
leosu
|
d7c8e396a1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 15:26:28 +01:00 |
|
leosu
|
337acecd7a
|
1243 fix
|
2014-03-19 15:26:21 +01:00 |
|
Emil Siverhall
|
ad02812e78
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 15:17:17 +01:00 |
|
Emil Siverhall
|
c22f5c814e
|
forum reply in threaded forum fixed.
|
2014-03-19 15:15:11 +01:00 |
|
Golrokh Moattar
|
57021d8bae
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 14:59:13 +01:00 |
|
Golrokh Moattar
|
421303003a
|
minor changes
|
2014-03-19 14:59:06 +01:00 |
|
Emil Siverhall
|
c206f321f9
|
thesis link panel fixed
|
2014-03-19 14:50:14 +01:00 |
|
Emil Siverhall
|
aca34e5090
|
admin-> match -> project partner fixed
|
2014-03-19 14:44:15 +01:00 |
|
Emil Siverhall
|
624f183ce9
|
turnitin settings
|
2014-03-19 14:33:09 +01:00 |
|
Emil Siverhall
|
fafbf76030
|
general settings
|
2014-03-19 14:30:42 +01:00 |
|
Emil Siverhall
|
10efd9f5d2
|
final seminar settings
|
2014-03-19 14:28:07 +01:00 |
|
Emil Siverhall
|
695e8ffa05
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 14:16:02 +01:00 |
|
Emil Siverhall
|
6d3cbb8955
|
fixed peer settings
|
2014-03-19 14:15:51 +01:00 |
|
Emil Siverhall
|
89f3fc10e6
|
project type settings model changes
|
2014-03-19 14:05:22 +01:00 |
|
Golrokh Moattar
|
9b75c20d76
|
no error throws if save review
|
2014-03-19 13:54:30 +01:00 |
|
Richard
|
007290e9a7
|
Added bootstrap styling to "Review this request"-button.
|
2014-03-19 13:48:36 +01:00 |
|
Golrokh Moattar
|
d492fe44b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 13:44:52 +01:00 |
|
leosu
|
56cb102cf2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 13:41:00 +01:00 |
|
leosu
|
1ebae85ba4
|
info string
|
2014-03-19 13:40:53 +01:00 |
|
Richard
|
249f37d676
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 13:35:11 +01:00 |
|
Richard
|
802757f6f3
|
Changed layout of the watson's box.
|
2014-03-19 13:34:57 +01:00 |
|
Golrokh Moattar
|
274f5024dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 13:30:38 +01:00 |
|
Golrokh Moattar
|
98817ae29b
|
changed save button to scrolling save button
|
2014-03-19 13:30:21 +01:00 |
|
Richard
|
ad37211155
|
Edited information about project titles (that they only can be changed in SciPro).
|
2014-03-19 13:20:58 +01:00 |
|
leosu
|
297852c4bb
|
set initial collapse
|
2014-03-19 13:14:42 +01:00 |
|
Emil Siverhall
|
a131e97a78
|
project column to peer requests
|
2014-03-19 11:50:21 +01:00 |
|
leosu
|
37e49dbc46
|
cleanup
|
2014-03-19 11:46:14 +01:00 |
|
leosu
|
d54ecb7fb5
|
toggleability for RequestSubmissionPanel
|
2014-03-19 11:45:52 +01:00 |
|
leosu
|
59cdc6454d
|
formatting
|
2014-03-19 11:23:31 +01:00 |
|
Richard
|
0c651755e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 11:07:29 +01:00 |
|
Richard
|
48f90e07af
|
Changed the columns.
|
2014-03-19 11:07:22 +01:00 |
|
leosu
|
60d3c19c68
|
fixed test
|
2014-03-19 11:03:12 +01:00 |
|
leosu
|
7818ccadcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 10:44:08 +01:00 |
|
leosu
|
8603a7351d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerRequestService.java
view/src/test/java/se/su/dsv/scipro/peer/panels/PeerPortalPanelTest.java
|
2014-03-19 10:44:00 +01:00 |
|
leosu
|
07aad16b13
|
hides requests
|
2014-03-19 10:42:24 +01:00 |
|
Emil Siverhall
|
1a6d9e0274
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerPortalPage.java
|
2014-03-19 10:41:54 +01:00 |
|
Emil Siverhall
|
c3851afb5e
|
removed abstract supervisor peer page
|
2014-03-19 10:41:13 +01:00 |
|
Emil Siverhall
|
da0086e786
|
removed supervisor peer review guide page
|
2014-03-19 10:35:28 +01:00 |
|
Emil Siverhall
|
70eee054ea
|
removed supervisor peer portal page
|
2014-03-19 10:33:36 +01:00 |
|
Golrokh Moattar
|
b36ac48fb9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/peer/pages/PeerPortalPage.java
view/src/test/java/se/su/dsv/scipro/peer/panels/PeerPortalPanelTest.java
|
2014-03-19 10:30:04 +01:00 |
|
Golrokh Moattar
|
bf8141f73a
|
test problems got fixed
|
2014-03-19 10:27:17 +01:00 |
|
Emil Siverhall
|
4e93a3a49a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-19 09:55:52 +01:00 |
|
Emil Siverhall
|
903941378e
|
removed all summary panel
|
2014-03-19 09:50:31 +01:00 |
|
Emil Siverhall
|
1c1938ce34
|
empty label added
|
2014-03-19 09:32:09 +01:00 |
|
leosu
|
3a520bfda2
|
made PeerPortalPanel not abstract
|
2014-03-19 09:26:51 +01:00 |
|
Emil Siverhall
|
baa077d92c
|
display reviewer name
|
2014-03-19 09:22:10 +01:00 |
|