|
|
10dcffc7a3
|
Removed serialVersionUID.
|
2013-12-18 17:08:27 +01:00 |
|
Richard
|
d81456200c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:44:26 +01:00 |
|
Richard
|
e04a9f6f03
|
Fixed issue with checkboxes not working correctly on supervisor > My ideas.
|
2013-12-18 16:42:44 +01:00 |
|
|
|
78dd858cf1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:42:06 +01:00 |
|
|
|
2416b551ec
|
UserImportWorker now saves supervisors as users and not just their projects and participants so that new supervisors without any projects in Daisy get imported correctly.
|
2013-12-18 16:41:49 +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 |
|
Richard
|
629a1953bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:13:00 +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 |
|
Richard
|
5f4bb15f64
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-18 16:00:10 +01:00 |
|
Richard
|
bc703c6e13
|
Fixed issue with checkboxes not working on admin > project management.
|
2013-12-18 15:59:32 +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 |
|
Emil Siverhall
|
fdcb48cea5
|
reusable textarea component with attached character count
|
2013-12-18 13:12:26 +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
|
75b7a21b82
|
fixed worker
|
2013-12-18 17:15:19 +09:00 |
|
fred-fri
|
6d63e4b525
|
fixed worker
|
2013-12-18 17:13:37 +09:00 |
|
fred-fri
|
e7d25325e6
|
fixed tests
|
2013-12-18 16:58:30 +09:00 |
|
fred-fri
|
7749966417
|
fixed worker
|
2013-12-18 16:28:21 +09:00 |
|
fred-fri
|
c72ddc58d2
|
feedbackpanel fix
|
2013-12-18 15:51:41 +09:00 |
|
Richard
|
59cce89d6d
|
Fixed issue with checkboxes not working in firefox on admin > match.
|
2013-12-17 16:56:10 +01:00 |
|
Richard
|
7087ece907
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 16:47:23 +01:00 |
|
Richard
|
fecb183262
|
- Changed text on show/hide filter on MyProjects.
- Overwrite of css to create a margin between checkboxes and text on MyProject filters.
|
2013-12-17 16:47:16 +01:00 |
|
Leo
|
5a5e4310e2
|
SupervisorGradingPage now renders different panels depending on role of logged in user
|
2013-12-17 16:43:29 +01:00 |
|
Leo
|
f6103de22c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 16:33:09 +01:00 |
|
Emil Siverhall
|
78b0059c92
|
removed some unused methods from milestone panels
|
2013-12-17 16:23:23 +01:00 |
|
Leo
|
487e11cdc1
|
Broke out GradingReportPointsPanel from FillOutGradingReport
|
2013-12-17 16:20:08 +01:00 |
|
Leo
|
80c7719d99
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 15:47:39 +01:00 |
|
Leo
|
fb42aa0e8b
|
broke out ScrollingSaveButton from FillOutGradingReportPanel
|
2013-12-17 15:47:22 +01:00 |
|
Richard
|
cec1b80a3f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 15:46:21 +01:00 |
|
Richard
|
23d431a4b7
|
Color and style changes to the feedbackpanels.
|
2013-12-17 15:46:13 +01:00 |
|
Emil Siverhall
|
b4bbfc5df5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 15:28:19 +01:00 |
|
Leo
|
e81a2ee587
|
Broke out CriteriaPanel from FillOutGradingReportPanel
|
2013-12-17 15:24:19 +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 |
|
Richard
|
a0d401e997
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 13:26:36 +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 |
|
Richard
|
4f3ee27f4d
|
Added information that at least 5 characters are needed when choosing title for an idea.
|
2013-12-17 13:24:05 +01:00 |
|
Emil Siverhall
|
0982f9427f
|
minor property change
|
2013-12-17 13:10:20 +01:00 |
|
Emil Siverhall
|
c133d8ede1
|
copy button label now specify author to copy from
|
2013-12-17 13:08:49 +01:00 |
|
Emil Siverhall
|
0d65e7b2dd
|
added feedback panel to supervisor project details view
|
2013-12-17 11:02:37 +01:00 |
|
Emil Siverhall
|
2eaf24bf8d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 10:42:49 +01:00 |
|
Emil Siverhall
|
7533867c51
|
changes to copy service method and button label
|
2013-12-17 10:28:44 +01:00 |
|
Leo
|
d8eb63727d
|
fixed a null pointer
|
2013-12-17 09:49:08 +01:00 |
|
Leo
|
e145bf8dec
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-17 09:27:39 +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 |
|
