|
|
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 |
|
|
|
2b2bdf62b1
|
Copying a report now also copies the plagiarism feedback.
|
2013-12-20 15:41:43 +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 |
|
|
|
69900e2498
|
Changed setSubmitted to a one-way method. No backsies!
|
2013-12-19 16:51:30 +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 |
|
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 |
|
|
|
44e2a14216
|
Fixed broken tests.
|
2013-12-19 15:31:13 +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 |
|
Leo
|
b8f245d39a
|
downloading a reviewer report now submits that report
|
2013-12-19 13:20:49 +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 |
|
|
|
0c2f1c0829
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-19 11:35:40 +01:00 |
|
|
|
a2d79e8de9
|
Removed method only used in a test.
|
2013-12-19 11:35:30 +01:00 |
|
|
|
9efa55402e
|
Removed a bunch of serialVersionUIDs.
|
2013-12-19 11:29:58 +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
|
9267636986
|
ReviewerFillOutGradingReportPanel now saves project criteria for all reports
|
2013-12-19 10:11:43 +01:00 |
|
Emil Siverhall
|
305caee788
|
validator for contract checkbox
|
2013-12-18 21:58:48 +01:00 |
|
Leo
|
1bf1a7cadb
|
fixed wrong name on migration script
|
2013-12-18 16:42:59 +01:00 |
|
Emil Siverhall
|
527488ba56
|
replaced watson fields on student idea submission with generic counter textarea
|
2013-12-18 16:40:19 +01:00 |
|
Leo
|
9ed336f022
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:29:38 +01:00 |
|
Leo
|
7e595822ec
|
*DataInitializer now creates individual criteria
*new service logic for reviewer grading reports
*database migration scripts
|
2013-12-18 16:28:49 +01:00 |
|
Emil Siverhall
|
7508e1dced
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:10:42 +01:00 |
|
Emil Siverhall
|
de71f281d7
|
removed IdeaService#validateSupervisorIdeaAcceptance and made the validation inside the form instead
|
2013-12-18 16:09:00 +01:00 |
|
Leo
|
3ede2d97ac
|
Added save button and database migration script
|
2013-12-18 13:38:50 +01:00 |
|
Emil Siverhall
|
eb5c00ed34
|
removed strange validation logic from description and prerequisites field when supervisors are submitting their own ideas
|
2013-12-18 13:35:36 +01:00 |
|
Leo
|
aa57ae73ff
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 12:06:17 +01:00 |
|
Leo
|
8d88837a84
|
*Broke out GradingReportForm form FillOutGradingReport
*Implemented most view layer parts of ReviewerFillOutGradingReportPanel
|
2013-12-18 12:05:41 +01:00 |
|
fred-fri
|
ff645bb292
|
fixed log
|
2013-12-18 16:14:46 +09:00 |
|
Emil Siverhall
|
e056ede7b8
|
make sure peer reviews may be submitted even if milestone code for these are missing
|
2013-12-17 15:55:31 +01:00 |
|
