|
|
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 |
|
Emil Siverhall
|
3fb2130a36
|
added default project classes to user profile filtering when creating new ones
|
2013-12-17 15:23:38 +01:00 |
|
niklas3
|
d548e3dda9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/DataInitializer.java
|
2013-12-17 13:26:27 +01:00 |
|
niklas3
|
16b546c98f
|
added option to hide project filter
|
2013-12-17 13:24:54 +01:00 |
|
Emil Siverhall
|
7533867c51
|
changes to copy service method and button label
|
2013-12-17 10:28:44 +01:00 |
|
Emil Siverhall
|
9a823dfdcd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 08:16:29 +01:00 |
|
Per Lundholm
|
d0265682f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 17:18:43 +01:00 |
|
Per Lundholm
|
0c0b61415b
|
Employees now can educate in English and Swedish by default. Methods were named to indicate whether they create data conditionally or not.
|
2013-12-16 17:18:35 +01:00 |
|
Emil Siverhall
|
50bff534f6
|
more detailed feedback message
|
2013-12-16 16:52:13 +01:00 |
|
Leo
|
9594f96711
|
new hide/show logic for approve final thesis panel concerning reviewers
|
2013-12-16 16:47:13 +01:00 |
|
Per Lundholm
|
854bfcb624
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 16:40:07 +01:00 |
|
Emil Siverhall
|
0e2e29e76a
|
added copy report button to report tabs if coauthor exists
|
2013-12-16 15:24:13 +01:00 |
|
Leo
|
09a270cda7
|
fixed some weirdly implemented notifications for approving or rejecting final thesis
|
2013-12-16 15:22:58 +01:00 |
|
Emil Siverhall
|
80baf5c020
|
first version of copy to for grading reports
|
2013-12-16 14:22:06 +01:00 |
|
Per Lundholm
|
4ee316d052
|
Added reaserach areas.
|
2013-12-16 11:39:47 +01:00 |
|
niklas3
|
d6f5c63a3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 11:26:38 +01:00 |
|
Per Lundholm
|
34bb1982b8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 10:59:30 +01:00 |
|
Per Lundholm
|
51711602c9
|
Revamped the names of the users. Blocked running when users already present.
|
2013-12-16 10:59:22 +01:00 |
|
Per Lundholm
|
5a149694fc
|
email address is always lowercase.
|
2013-12-16 10:58:28 +01:00 |
|
niklas3
|
bcfdb907e3
|
Removed ProjectBuilder. BYE
|
2013-12-16 10:18:40 +01:00 |
|
Leo
|
ce810eb605
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 09:46:27 +01:00 |
|
fred-fri
|
b8be54e37f
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-16 17:18:56 +09:00 |
|
fred-fri
|
f743612106
|
adding users in datainitializer
|
2013-12-16 17:18:10 +09:00 |
|
Leo
|
e6a7682ef9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 09:11:03 +01:00 |
|
fred-fri
|
acfca7f05a
|
adding users in datainitializer
|
2013-12-16 16:46:56 +09:00 |
|
fred-fri
|
2b9799c748
|
adding users in datainitializer
|
2013-12-16 16:39:35 +09:00 |
|
fred-fri
|
082e623cf3
|
adding users in datainitializer
|
2013-12-16 16:27:20 +09:00 |
|
fred-fri
|
068a7621d3
|
adding users in datainitializer
|
2013-12-16 16:18:27 +09:00 |
|
Emil Siverhall
|
ca8ce04d3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-16 08:18:25 +01:00 |
|
