Richard
|
cf00b56ffb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 17:32:03 +01:00 |
|
Richard
|
3c963be2d5
|
First styling of the reviewerGradingReport.
Minor style changes to the supervisorGradingReport.
|
2013-12-20 17:31:54 +01:00 |
|
|
|
f41dba3aef
|
Removed unused code.
|
2013-12-20 17:19:45 +01:00 |
|
|
|
fedd9d708c
|
Removed unused method.
|
2013-12-20 17:16:18 +01:00 |
|
|
|
82eb6e2a9f
|
Removed unused methods.
|
2013-12-20 17:14:31 +01:00 |
|
|
|
21b47a5072
|
Removed unused method.
|
2013-12-20 17:12:53 +01:00 |
|
|
|
2ce58025de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 17:11:54 +01:00 |
|
|
|
6444407156
|
Removed unused method.
|
2013-12-20 17:11:50 +01:00 |
|
Leo
|
b766ccb2e4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 17:04:42 +01:00 |
|
Leo
|
db6be5e9fd
|
fixed a bug
|
2013-12-20 17:04:30 +01:00 |
|
|
|
d472c13c37
|
MailEventWorker does not delete MailEvent entities if the application is running in TEST mode.
|
2013-12-20 16:46:16 +01:00 |
|
|
|
24b031c06f
|
When adding a project schedule to a project at start date now uses any specified default activity plan template for the projects type.
|
2013-12-20 16:20:21 +01:00 |
|
|
|
4f2b37281f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 16:11:01 +01:00 |
|
|
|
5cbf72537f
|
Added reference to default activity plan template reference from ProjectType.
|
2013-12-20 16:10:56 +01:00 |
|
Leo
|
ade0be1f6f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 16:09:02 +01:00 |
|
Leo
|
7837a370d8
|
changed logic for activating download button because the previous was somewhat faulty
|
2013-12-20 16:08:47 +01:00 |
|
|
|
a2ffe38f82
|
Added column referencing schedule_template to ProjectType to enable setting a default activity plan template to be added to projects for that type.
|
2013-12-20 16:06:40 +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 |
|
|
|
2b2bdf62b1
|
Copying a report now also copies the plagiarism feedback.
|
2013-12-20 15:41:43 +01:00 |
|
|
|
33179bc73e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-20 15:35:18 +01:00 |
|
|
|
ff74377b61
|
Removed stupid new Date() parameter from a bunch of methods in ApplicationPeriodService.
The tests are now stupid. Favor integration tests for simple methods only delegating all the sorting/ordering/filtering to the database.
|
2013-12-20 15:35:15 +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 |
|
|
|
b0d87600db
|
Fixed spelling.
|
2013-12-19 16:41:12 +01:00 |
|
|
|
ae6d05ac85
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 16:40:29 +01:00 |
|
|
|
291a3f88a2
|
Removed unused interface.
|
2013-12-19 16:22:18 +01:00 |
|
|
|
2aaf6a00d5
|
Removed unused method.
|
2013-12-19 16:19:58 +01:00 |
|
|
|
232c3fde6a
|
Removed unused method.
|
2013-12-19 16:19:13 +01:00 |
|
|
|
cd70b7f6a8
|
Removed unused method.
|
2013-12-19 16:18:06 +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 |
|
|
|
44e2a14216
|
Fixed broken tests.
|
2013-12-19 15:31:13 +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 |
|
