|
|
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 |
|
leosu
|
955143d4a1
|
disable radios after submit
|
2014-03-04 13:16:30 +01:00 |
|
|
|
ab316e8079
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:12:09 +01:00 |
|
|
|
3caf85792f
|
Checkbox gets deselected if you do not confirm completion in the project overview.
|
2014-03-04 13:12:04 +01:00 |
|
Richard
|
3895ac1db1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:07:20 +01:00 |
|
Richard
|
ce56a70489
|
Added margin below create preliminary grading report button.
|
2014-03-04 13:06:50 +01:00 |
|
leosu
|
04a04ad37f
|
copy opposition feedback to grading report
|
2014-03-04 13:05:46 +01:00 |
|
|
|
360a644c65
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 13:00:56 +01:00 |
|
leosu
|
549baf08b3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 11:18:15 +01:00 |
|
leosu
|
e847440ef3
|
removed unused properties files
|
2014-03-04 11:18:08 +01:00 |
|
Emil Siverhall
|
86f2a2fa48
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.html
view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java
view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.properties
|
2014-03-04 10:47:00 +01:00 |
|
Emil Siverhall
|
9569e5276a
|
merge
|
2014-03-04 10:46:29 +01:00 |
|
Emil Siverhall
|
dd83c6eee8
|
Admin -> Statistics -> Idea statuses hooked up with match module
|
2014-03-04 10:42:35 +01:00 |
|
Emil Siverhall
|
afec295fb2
|
Admin -> Statistics -> Ideas now uses Module.MATCH when generating columns
|
2014-03-04 10:28:20 +01:00 |
|
fred-fri
|
e6abd93c62
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-03-04 18:25:12 +09:00 |
|
fred-fri
|
66a0aec622
|
added confirmation
|
2014-03-04 18:24:33 +09:00 |
|
leosu
|
beca7f98af
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 10:23:09 +01:00 |
|
leosu
|
3ec16cea6b
|
fixed NPE
|
2014-03-04 10:23:03 +01:00 |
|
fred-fri
|
983ce7bc71
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 18:11:17 +09:00 |
|
fred-fri
|
7d9862ac89
|
student can no longer activate milestones that shouldnt be possible for them to activate
|
2014-03-04 18:11:02 +09:00 |
|
Emil Siverhall
|
d0dde877c7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 10:09:17 +01:00 |
|
Emil Siverhall
|
8ca53cb82a
|
form feedback to display error if overlapping period already exists.
|
2014-03-04 10:09:00 +01:00 |
|
Richard
|
d3411604bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:52:05 +01:00 |
|
Richard
|
fd50b61253
|
Added list-unstyled on upcoming project milestones.
|
2014-03-04 09:51:51 +01:00 |
|
Emil Siverhall
|
43698b917b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:48:22 +01:00 |
|
|
|
212d7f71d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-04 09:41:02 +01:00 |
|
fred-fri
|
112a14281f
|
adding asterisk around required points
|
2014-03-04 17:40:42 +09:00 |
|
