|
|
80a1b8c694
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 13:58:12 +01:00 |
|
Emil Siverhall
|
d3959a9fe5
|
replaced FilterFormAreaPanel on admin -> ideas and manage targets pages
|
2013-12-12 13:40:00 +01:00 |
|
|
|
560df80376
|
Added default project type filter to user profile.
|
2013-12-12 13:39:43 +01:00 |
|
niklas3
|
84ccf5c202
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 13:37:40 +01:00 |
|
niklas3
|
abd7ae5508
|
Fixed over 9000 tests with NPE:s
|
2013-12-12 13:37:20 +01:00 |
|
Emil Siverhall
|
08a63ef510
|
ResearchAreaService now order alphabetically through sql query
|
2013-12-12 13:32:21 +01:00 |
|
|
|
8c34c197da
|
Added default supervisor filter to user profile.
|
2013-12-12 13:21:34 +01:00 |
|
Emil Siverhall
|
4730f1dfbf
|
@Data ResearchArea
|
2013-12-12 13:21:15 +01:00 |
|
|
|
81019da1ee
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 13:13:22 +01:00 |
|
Emil Siverhall
|
25d328bbbf
|
@Data unit
|
2013-12-12 11:58:14 +01:00 |
|
|
|
d49ae56ab0
|
Added default project team member roles filter to user profile.
|
2013-12-12 11:21:24 +01:00 |
|
Emil Siverhall
|
deea784e27
|
milestone overview tab should only show milestone activities within the correct project type
|
2013-12-12 11:13:38 +01:00 |
|
Emil Siverhall
|
566176b89e
|
filter changes on admin -> manage targets
|
2013-12-12 09:58:50 +01:00 |
|
|
|
81c40f3b08
|
Suppressed warnings due to Lombok.
|
2013-12-12 09:14:26 +01:00 |
|
fred-fri
|
5f43d76fd4
|
removing things named projectclass
|
2013-12-12 16:37:22 +09:00 |
|
fred-fri
|
d0b8db78e4
|
removing things named projectclass
|
2013-12-12 16:22:35 +09:00 |
|
fred-fri
|
1f7389487f
|
removing things named projectclass
|
2013-12-12 14:40:15 +09:00 |
|
fred-fri
|
aea805fa4b
|
renaming target projectclass to projecttype
|
2013-12-12 14:31:17 +09:00 |
|
fred-fri
|
224c74f359
|
renaming target projectclass to projecttype
|
2013-12-12 14:06:34 +09:00 |
|
fred-fri
|
7876be9709
|
renamed projectclasssettings projecttypesettings
|
2013-12-12 13:43:58 +09:00 |
|
fred-fri
|
8ff37bc06d
|
renamed checkllisttemplateprojecttype join column and attributes
|
2013-12-12 12:32:58 +09:00 |
|
fred-fri
|
c9fb4d2cbd
|
added codes to milestones in datainitializer
|
2013-12-12 11:11:09 +09:00 |
|
|
|
71101ac26a
|
Added default project status filter to user profile.
|
2013-12-11 17:14:27 +01:00 |
|
|
|
912f31f0fa
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/reusable/AjaxCheckBoxMultipleChoice.java
|
2013-12-11 17:14:03 +01:00 |
|
|
|
b0e98b1a36
|
@Data UserProfile
|
2013-12-11 16:40:13 +01:00 |
|
niklas3
|
6c87eb255b
|
Hide "Opposition and peer review" from tabs if active project is ICT4D. Had to fix null pointers for every test in the world
|
2013-12-11 16:17:28 +01:00 |
|
|
|
6418d6cfee
|
Loosened coupling by changing HashSet to Collection.
|
2013-12-11 16:07:29 +01:00 |
|
|
|
c868b473d2
|
Loosened coupling by changing HashSet to Collection.
|
2013-12-11 15:54:14 +01:00 |
|
niklas3
|
6eb0f2caa7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:59:56 +01:00 |
|
niklas3
|
24dbe0ceb7
|
Clean-up in aisle 5.
|
2013-12-11 14:59:52 +01:00 |
|
niklas3
|
7eeaa99fd4
|
Changed named of DataInitialiser.
|
2013-12-11 14:57:39 +01:00 |
|
niklas3
|
43b4a6af6d
|
Changed named of DataInitialiser + removed default users.
|
2013-12-11 14:57:20 +01:00 |
|
Emil Siverhall
|
5cc2f7309d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:50:24 +01:00 |
|
Emil Siverhall
|
63b31d93b3
|
removed ProjectClassFilter and replaced it with CheckBoxMultipleChoice component with Ajax behavior
|
2013-12-11 14:50:11 +01:00 |
|
Leo
|
98382e099c
|
GradingReport.getCriteria() sort criteria
|
2013-12-11 12:46:09 +01:00 |
|
|
|
526da96760
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:59:28 +01:00 |
|
|
|
a73e8e6069
|
Moved plagiarism feedback requirement to isFinished in GradingReport.
Turned <a> tag into <button> to get automatic disabled="disabled" attribute.
|
2013-12-11 11:59:23 +01:00 |
|
|
|
a4ac0dbf15
|
Added tests and renamed method.
|
2013-12-11 11:47:42 +01:00 |
|
|
|
ca9c22ff58
|
Grading report has a grade if all criteria have points even without feedback.
|
2013-12-11 11:39:26 +01:00 |
|
|
|
16965d77d5
|
Spelling.
|
2013-12-11 11:29:37 +01:00 |
|
|
|
ae2404700b
|
Creating criteria is done with polymorphism instead of if.
|
2013-12-11 11:28:57 +01:00 |
|
Emil Siverhall
|
5867968066
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:10:52 +01:00 |
|
Leo
|
3db25db883
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 10:44:15 +01:00 |
|
Leo
|
2f5544049e
|
added missed part of commit
|
2013-12-11 10:44:01 +01:00 |
|
Emil Siverhall
|
414072e1d1
|
service method for retrieving all active project types with a proper degree level
|
2013-12-11 10:33:37 +01:00 |
|
Emil Siverhall
|
5a9988c841
|
renamed project class service and project class repo
|
2013-12-11 09:28:21 +01:00 |
|
fred-fri
|
4cde27444e
|
dont add milestones if they already exist
|
2013-12-11 14:23:49 +09:00 |
|
|
|
a5aaad8e4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:43:15 +01:00 |
|
|
|
d3a66f9272
|
Removed code from ProjectType.
|
2013-12-10 16:43:11 +01:00 |
|
niklas3
|
e376a64f3a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:38:49 +01:00 |
|
