Leo
|
7837a370d8
|
changed logic for activating download button because the previous was somewhat faulty
|
2013-12-20 16:08:47 +01:00 |
|
Leo
|
fe024bfa3f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 15:47:55 +01:00 |
|
Leo
|
77cd6286c7
|
added confirmation dialogs to submit buttons in grading report
|
2013-12-20 15:47:47 +01:00 |
|
Emil Siverhall
|
ac98d568e6
|
do not allow copying to submitted reports
|
2013-12-20 15:34:39 +01:00 |
|
Emil Siverhall
|
40c40ab160
|
component feedback panels on author idea submissions as well
|
2013-12-19 22:27:37 +01:00 |
|
Emil Siverhall
|
beae9fe35d
|
CounterTextArea now has it's own component feedback panel
|
2013-12-19 22:13:25 +01:00 |
|
Emil Siverhall
|
1f0a03943c
|
no need to pass co author to choice component since we don't allow editing of submitted ideas
|
2013-12-19 21:01:57 +01:00 |
|
Emil Siverhall
|
c1404fbb87
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 17:06:48 +01:00 |
|
Emil Siverhall
|
d040c56e1f
|
component feedback panels on supervisor idea submission page
|
2013-12-19 17:06:37 +01:00 |
|
Richard
|
6850fedddc
|
Added white-space: pre-wrap to grading report criterions.
|
2013-12-19 17:04:34 +01:00 |
|
|
|
69900e2498
|
Changed setSubmitted to a one-way method. No backsies!
|
2013-12-19 16:51:30 +01:00 |
|
|
|
2cef9792de
|
Removed method call, it should not be possible to "unsubmit" a grading report
|
2013-12-19 16:46:44 +01:00 |
|
|
|
ae6d05ac85
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 16:40:29 +01:00 |
|
|
|
b2f9d5e210
|
Removed unused constructor.
|
2013-12-19 16:17:09 +01:00 |
|
|
|
ed01ff15bc
|
Removed unused constructor.
|
2013-12-19 16:16:25 +01:00 |
|
|
|
7a23eacc7c
|
Refactored a bit and removed unused constructor.
|
2013-12-19 16:15:32 +01:00 |
|
|
|
b9561e031b
|
Removed unused method.
|
2013-12-19 16:08:14 +01:00 |
|
Emil Siverhall
|
adc770face
|
merge
|
2013-12-19 16:05:32 +01:00 |
|
Emil Siverhall
|
067d49ad31
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaSubmissionPanel.java
|
2013-12-19 16:05:01 +01:00 |
|
Emil Siverhall
|
743a7a25fe
|
removed validateStudentIdeaSubmission
|
2013-12-19 16:01:06 +01:00 |
|
Leo
|
a45d172c9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 16:01:01 +01:00 |
|
Leo
|
1ce069c78d
|
*hide/show logic for individual criteria labels and info about waiting for supervisor
*can not download reports before submitting
|
2013-12-19 16:00:52 +01:00 |
|
Emil Siverhall
|
2b6f32f8e6
|
minor changes
|
2013-12-19 15:30:52 +01:00 |
|
|
|
d5db9bf3df
|
Removed serialVersionUID.
|
2013-12-19 15:28:15 +01:00 |
|
Leo
|
6478216236
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 15:23:39 +01:00 |
|
Leo
|
fdaa11d2f6
|
added submitbutton to ReviewerFillOutGradingPanel and an info label for when supervisor has not submitted
|
2013-12-19 15:23:28 +01:00 |
|
Emil Siverhall
|
b2f0e182ff
|
replaced partner addition panel with a separate auto complete component with its own validation when submitting ideas
|
2013-12-19 15:20:51 +01:00 |
|
|
|
3e9a487040
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 13:47:00 +01:00 |
|
|
|
9a1e4381e5
|
Minor fixes.
|
2013-12-19 13:46:56 +01:00 |
|
Leo
|
b8f245d39a
|
downloading a reviewer report now submits that report
|
2013-12-19 13:20:49 +01:00 |
|
|
|
c5e267ce24
|
Cleaned up test.
|
2013-12-19 11:58:21 +01:00 |
|
|
|
79c4cff08c
|
Stupid test.
|
2013-12-19 11:55:59 +01:00 |
|
Leo
|
1423cb8e7a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 11:45:14 +01:00 |
|
Leo
|
ec699dd3ec
|
moved name labels
|
2013-12-19 11:45:06 +01:00 |
|
|
|
10c35e5872
|
Removed method from interface.
Removed formal parameter that was not used (was always new Date()).
|
2013-12-19 11:42:00 +01:00 |
|
Leo
|
ac83a413b8
|
added name labels
|
2013-12-19 11:40:58 +01:00 |
|
|
|
d0e1237cf2
|
Removed unused field.
|
2013-12-19 11:37:36 +01:00 |
|
|
|
0c2f1c0829
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 11:35:40 +01:00 |
|
Leo
|
c20b90eece
|
inactivated submit button and anti plagiarism field after submit
|
2013-12-19 11:34:29 +01:00 |
|
|
|
9efa55402e
|
Removed a bunch of serialVersionUIDs.
|
2013-12-19 11:29:58 +01:00 |
|
Leo
|
ef0fb96810
|
*Supervisors can no longer edit reports after submitting
*fixed a bug with saving on ReviewerFillOutGradingReportPanel
|
2013-12-19 11:24:41 +01:00 |
|
Leo
|
7bdc05f735
|
You can now submit grading reports
|
2013-12-19 10:53:58 +01:00 |
|
Emil Siverhall
|
cb6b295cab
|
renamed panel
|
2013-12-19 10:12:07 +01:00 |
|
Leo
|
d2c07b97ce
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 10:11:53 +01:00 |
|
Leo
|
9267636986
|
ReviewerFillOutGradingReportPanel now saves project criteria for all reports
|
2013-12-19 10:11:43 +01:00 |
|
|
|
ff2639e781
|
Removed unused page.
|
2013-12-19 09:24:29 +01:00 |
|
|
|
fd9a8a67c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 09:09:48 +01:00 |
|
fred-fri
|
b5d3141514
|
moved info
|
2013-12-19 14:30:51 +09:00 |
|
fred-fri
|
09ecad7060
|
redirect fix
|
2013-12-19 14:20:36 +09:00 |
|
Emil Siverhall
|
305caee788
|
validator for contract checkbox
|
2013-12-18 21:58:48 +01:00 |
|
