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 |
|
|
|
2d5da2a70e
|
Renamed method.
|
2014-03-04 15:01:04 +01:00 |
|
|
|
eec2882a8a
|
Removed stupid boolean that was always true.
|
2014-03-04 15:00:35 +01:00 |
|
|
|
b59f2d8e53
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:52:12 +01:00 |
|
|
|
463a91dd84
|
Removed dependency on ApplicationPeriodExemption from Student.
|
2014-03-04 14:52:05 +01:00 |
|
Emil Siverhall
|
b86a55c9c8
|
default sort on event date
|
2014-03-04 14:51:53 +01:00 |
|
Richard
|
54146b4713
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:40:55 +01:00 |
|
Richard
|
9c6ea268de
|
Removed unused icons from 16/ and 24/.
|
2014-03-04 14:40:29 +01:00 |
|
leosu
|
560df639eb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:35:19 +01:00 |
|
leosu
|
6dfbc9dc67
|
students can edit all activities
|
2014-03-04 14:35:11 +01:00 |
|
Richard
|
fa9cd30e3a
|
Removed unused icons ImageObject.java
|
2014-03-04 14:34:43 +01:00 |
|
Richard
|
b262ccbbb0
|
Removed unused icons from 16/
|
2014-03-04 14:26:49 +01:00 |
|
Richard
|
b4dbb88052
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:13:55 +01:00 |
|
Richard
|
17ee660ce4
|
Removed unused icons from 24/
|
2014-03-04 14:13:48 +01:00 |
|
Emil Siverhall
|
b72c0ebcb3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 14:12:15 +01:00 |
|
Emil Siverhall
|
b6824a7bcc
|
changed confirmation messages for seminar participation assessment
|
2014-03-04 14:12:04 +01:00 |
|
leosu
|
f70f67e719
|
removed beta annotations
|
2014-03-04 14:11:00 +01:00 |
|
Emil Siverhall
|
16c5d5040c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:53:02 +01:00 |
|
Emil Siverhall
|
d99d1cb961
|
getString during construction warnings
|
2014-03-04 13:52:24 +01:00 |
|
Richard
|
3283dfb955
|
Removed 32/ and 46/ from ImageObject.java.
Changed img in css from 32/ to 24/.
Changed images in ProjectsOverviewPanel.java from 32/ to 24/.
|
2014-03-04 13:45:48 +01:00 |
|
Richard
|
e9561de388
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:22:50 +01:00 |
|
Richard
|
5b6291613f
|
Removed 32px icons
|
2014-03-04 13:22:41 +01:00 |
|
Richard
|
ea611ce31a
|
Removed 48px icons
|
2014-03-04 13:21:37 +01:00 |
|
Richard
|
0a9f5d5f5f
|
Changed icon from 24px to 16px
|
2014-03-04 13:20:47 +01:00 |
|
leosu
|
5378fa8c44
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:16:35 +01:00 |
|
