Richard
|
dde2bcbda9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/forum/panels/RejectFinalThesisPanel.html
|
2013-11-15 17:06:46 +01:00 |
|
Richard
|
f14efbb97a
|
Styling of RejectFinalThesisPanel.
|
2013-11-15 17:03:41 +01:00 |
|
niklas3
|
6ac3d0cc33
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 17:02:54 +01:00 |
|
niklas3
|
c378159577
|
Button in rejectfinalthesispanel now has its own property and the same button in createforumthreadpanel has its own seperate property.
|
2013-11-15 17:02:48 +01:00 |
|
Richard
|
de99842d27
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 16:29:23 +01:00 |
|
Emil Siverhall
|
dccef1f4c9
|
changed date formatting
|
2013-11-15 16:18:30 +01:00 |
|
niklas3
|
a488a29edb
|
RejectFinalThesisPanel now has its own markup(again).
|
2013-11-15 16:05:18 +01:00 |
|
niklas3
|
5bc9025138
|
RejectFinalThesisPanel got its own markup!!
(+ project)
|
2013-11-15 15:53:43 +01:00 |
|
niklas3
|
ee6d384070
|
Revert "added teardown and cleared database after test."
This reverts commit 6cc65c9518365976e1fdf25b2bc57e4947af38ca.
|
2013-11-15 14:53:36 +01:00 |
|
niklas3
|
6cc65c9518
|
added teardown and cleared database after test.
|
2013-11-15 14:45:02 +01:00 |
|
niklas3
|
f8a64bc310
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:43:13 +01:00 |
|
Richard
|
bbd857eb29
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:42:00 +01:00 |
|
Richard
|
34ffb33414
|
Continued styling of final thesis panels.
|
2013-11-15 14:39:22 +01:00 |
|
Emil Siverhall
|
4f667a8154
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:25:12 +01:00 |
|
niklas3
|
6253d0bfe6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:24:51 +01:00 |
|
Emil Siverhall
|
1986f93e59
|
added info panel to final thesis when status is NO_DECISION
|
2013-11-15 14:24:47 +01:00 |
|
niklas3
|
2f7a5b5383
|
because crunch
|
2013-11-15 14:24:43 +01:00 |
|
Richard
|
473741648f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 14:20:14 +01:00 |
|
Richard
|
3b0eff1c07
|
Continued styling of final thesis panels.
|
2013-11-15 14:20:07 +01:00 |
|
Emil Siverhall
|
dd6dbe11cf
|
removed grade from .txt creation since this isn't implemented to grading report yet
|
2013-11-15 14:08:41 +01:00 |
|
niklas3
|
774fad061e
|
Added link to threaded forum in the author view when a revision request has been sent.
|
2013-11-15 13:39:08 +01:00 |
|
Emil Siverhall
|
db6abfee3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 13:37:22 +01:00 |
|
Emil Siverhall
|
ec6474f83f
|
Supervisors are not allowed to specify a first meeting date that occurs before application period course start
|
2013-11-15 13:35:49 +01:00 |
|
Richard
|
969812b6d0
|
Flyttat final thesis panel längst upp till vänster på project overview.
Tillfälligt tagit bort info-texten då den visades på felaktiga final thesis-paneler.
|
2013-11-15 13:28:18 +01:00 |
|
fred-fri
|
3318f7f63c
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-15 19:59:34 +09:00 |
|
fred-fri
|
c2a5b3e8eb
|
get
|
2013-11-15 19:58:52 +09:00 |
|
Emil Siverhall
|
cbda30a080
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 09:28:51 +01:00 |
|
Emil Siverhall
|
256b672109
|
renamed SubmitNewFirstMeetingPanel
|
2013-11-15 09:28:36 +01:00 |
|
Richard
|
7c4d8c052c
|
Continued styling of the final thesis panels.
|
2013-11-15 09:24:35 +01:00 |
|
Emil Siverhall
|
6db4072649
|
date format change on approve final thesis panel
|
2013-11-15 09:23:35 +01:00 |
|
Richard
|
a8b1db15fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 09:00:44 +01:00 |
|
Emil Siverhall
|
15d3176fe5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-15 08:58:47 +01:00 |
|
Emil Siverhall
|
c994e7db47
|
date format change on peer tables
|
2013-11-15 08:58:16 +01:00 |
|
fred-fri
|
ef8520c0b2
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:48:52 +09:00 |
|
fred-fri
|
a5143e16bf
|
refactoring, removed retrievebyidentifier method
|
2013-11-15 15:39:18 +09:00 |
|
fred-fri
|
060ca7edd4
|
refactored a method
|
2013-11-15 15:03:33 +09:00 |
|
fred-fri
|
08827a0a41
|
Merge branch 'per' into develop
|
2013-11-15 11:05:01 +09:00 |
|
Per Lundholm
|
95422c5f12
|
Method storeForumFile made private part of ForumService
|
2013-11-14 17:10:14 +01:00 |
|
Emil Siverhall
|
70346b6cf7
|
changed grading report text resource test to go with locale changes
|
2013-11-14 16:43:45 +01:00 |
|
Emil Siverhall
|
9e577d710c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:36:14 +01:00 |
|
Emil Siverhall
|
832d781946
|
changed turnitinsettingspagetest to fit new datetextfield
|
2013-11-14 16:35:56 +01:00 |
|
niklas3
|
89ac27e49f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:34:42 +01:00 |
|
|
|
6dd12e01ae
|
Fixed test to use proper date formatting.
|
2013-11-14 16:33:36 +01:00 |
|
Emil Siverhall
|
3b058447c0
|
changed datefield on turnitin settings page
|
2013-11-14 16:22:51 +01:00 |
|
|
|
cb904e9bc5
|
Changed to English locale and updated StylableDateTimeField to use system wide date-format settings and 24-hour format.
|
2013-11-14 16:21:14 +01:00 |
|
|
|
e1d4a847b3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:07:49 +01:00 |
|
niklas3
|
fc761ed351
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-14 16:03:16 +01:00 |
|
niklas3
|
737de64995
|
fix'd
|
2013-11-14 16:02:57 +01:00 |
|
|
|
a4cd8ab3ff
|
Guarded against null since the component is an ajax fallback link.
|
2013-11-14 15:53:38 +01:00 |
|
Emil Siverhall
|
d123c82b07
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-14 15:49:29 +01:00 |
|
