|
|
127f160a23
|
Merge branch 'develop' into improvement/roles
Conflicts:
core/src/main/java/se/su/dsv/scipro/peer/PeerReview.java
core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
|
2014-03-05 17:10:11 +01:00 |
|
Emil Siverhall
|
94c543ddde
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 16:11:48 +01:00 |
|
Emil Siverhall
|
2a926a3807
|
count authors with more than one project participation on authors -> statistics
|
2014-03-05 16:11:33 +01:00 |
|
leosu
|
7c54a046d1
|
fixed NPE
|
2014-03-05 15:53:13 +01:00 |
|
Richard
|
a0531c5524
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 15:43:50 +01:00 |
|
Richard
|
02b79c726a
|
Removed unused css file from BasePage.html.
|
2014-03-05 15:43:41 +01:00 |
|
Emil Siverhall
|
e7c4feb02c
|
deactivatable date picker on author statistics page
|
2014-03-05 14:43:52 +01:00 |
|
Emil Siverhall
|
e4f75abcfb
|
removed old date filter
|
2014-03-05 14:29:34 +01:00 |
|
Emil Siverhall
|
c9b1769389
|
inactive not default selected
|
2014-03-05 12:47:11 +01:00 |
|
Emil Siverhall
|
cc112865d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 12:05:27 +01:00 |
|
leosu
|
ecde97a29a
|
annotation fix
|
2014-03-05 11:58:16 +01:00 |
|
Emil Siverhall
|
d8fe67bd56
|
reverted some unfinished peer stuff, peer sprint next week
|
2014-03-05 11:58:10 +01:00 |
|
leosu
|
5788a94ef1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 11:33:45 +01:00 |
|
|
|
a966698ff0
|
Re-added opposition, reviewer and supervisor file upload/comment.
|
2014-03-05 11:29:05 +01:00 |
|
leosu
|
c10370f0d7
|
reverted beta annotations
|
2014-03-05 11:26:57 +01:00 |
|
leosu
|
9a7825dcda
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 11:17:49 +01:00 |
|
leosu
|
fd34129a8e
|
confirm dialogue
|
2014-03-05 11:17:42 +01:00 |
|
Emil Siverhall
|
092192e46e
|
fixed idea participation toString when submitting first meeting
|
2014-03-05 10:29:15 +01:00 |
|
Emil Siverhall
|
81e638d32f
|
fixed typo and added resource model for label on supervisor idea creation page
|
2014-03-05 09:56:51 +01:00 |
|
Emil Siverhall
|
a531598dca
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-05 09:43:16 +01:00 |
|
Emil Siverhall
|
7924fa2766
|
null check newSelection add remove students panel
|
2014-03-05 09:42:57 +01:00 |
|
Emil Siverhall
|
d4fc57f47f
|
changes to summary panel
|
2014-03-05 09:42:35 +01:00 |
|
leosu
|
331130d656
|
fixed outdated test
|
2014-03-05 09:23:02 +01:00 |
|
leosu
|
db7c8eff74
|
attachment icon
|
2014-03-05 09:20:27 +01:00 |
|
Emil Siverhall
|
4203449a80
|
some target issues
|
2014-03-05 08:32:21 +01:00 |
|
Richard
|
49fd24417d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 17:56:30 +01:00 |
|
Richard
|
6d97fcfc66
|
Updated bootstrap glyphicons.
|
2014-03-04 17:56:07 +01:00 |
|
|
|
f63d670af0
|
Removed EXTERNAL role.
|
2014-03-04 17:17:47 +01:00 |
|
|
|
b8800949eb
|
Migrating helper functions away from Employee.
|
2014-03-04 17:04:01 +01:00 |
|
Richard
|
993dcbbafd
|
Removed the use of icon user1.png. Replaced it with glyphicon-user.
|
2014-03-04 16:50:20 +01:00 |
|
|
|
915842d0d5
|
Moved Employee attributes to User.
|
2014-03-04 16:44:09 +01:00 |
|
Golrokh Moattar
|
303f9d4f07
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 16:37:48 +01:00 |
|
Richard
|
1300da15a4
|
Removed the icon check2.png.
Replaced it with glyphicon-ok.
|
2014-03-04 16:33:56 +01:00 |
|
Richard
|
9db4878e02
|
Removed icon star_red.png.
|
2014-03-04 16:28:15 +01:00 |
|
Richard
|
fc87219c5e
|
Replaced icon Star_red with glyphicon flag.
|
2014-03-04 16:27:05 +01:00 |
|
Emil Siverhall
|
30be0a7612
|
peer summary panel that lists all completed requests/reviews
|
2014-03-04 16:10:28 +01:00 |
|
Golrokh Moattar
|
abe4ad732b
|
Delete opponentReport and OppositionReport is possible by Admin Role
|
2014-03-04 16:05:42 +01:00 |
|
leosu
|
5fc695241a
|
fixed editable by authors (for real this time)
|
2014-03-04 16:04:31 +01:00 |
|
Golrokh Moattar
|
665c880119
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 15:50:38 +01:00 |
|
Golrokh Moattar
|
add00c579a
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.java
|
2014-03-04 15:50:12 +01:00 |
|
leosu
|
c3bd1c52df
|
page instead of modal window
|
2014-03-04 15:46:46 +01:00 |
|
leosu
|
f1cb0a3a76
|
fixed label
|
2014-03-04 15:34:03 +01:00 |
|
leosu
|
b27c1d0836
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 15:32:28 +01:00 |
|
leosu
|
c6b2e9a881
|
*editable by authors fix
*removed incorrect labels
|
2014-03-04 15:32:23 +01:00 |
|
Richard
|
877825e326
|
Removed more unused icons.
|
2014-03-04 15:31:26 +01:00 |
|
Emil Siverhall
|
8f6a21a645
|
count peerreviews with status parameter instead of separate methods for each status
|
2014-03-04 15:28:18 +01:00 |
|
|
|
6f152d70a0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 15:18:41 +01:00 |
|
|
|
53568adf03
|
Switched to GenericDataPanel2 with a FilteredProvider.
|
2014-03-04 15:18:37 +01:00 |
|
Emil Siverhall
|
c09d91618e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 15:04:27 +01:00 |
|
Emil Siverhall
|
e59079d997
|
switched to use GenericDataPanel2
|
2014-03-04 15:04:17 +01:00 |
|
