Emil Siverhall
|
bf9edfc5f0
|
some refactoring after removal of filterstring panel
|
2013-12-16 08:18:03 +01:00 |
|
fred-fri
|
fd40e50a78
|
adding users in datainitializer
|
2013-12-16 15:35:38 +09:00 |
|
fred-fri
|
78200be924
|
adding users in datainitializer
|
2013-12-16 14:48:12 +09:00 |
|
fred-fri
|
ff7ccbcf39
|
making userbuilder
|
2013-12-16 14:20:00 +09:00 |
|
fred-fri
|
425ebc7089
|
datainitializer only does stuff if dev profile is on
|
2013-12-16 13:25:26 +09:00 |
|
fred-fri
|
3708358664
|
added peer codes to datainitialiser
|
2013-12-16 12:56:13 +09:00 |
|
niklas3
|
aa1e1a1a9f
|
Partially removed dependency on ProjectBuilder.
|
2013-12-13 17:19:51 +01:00 |
|
Emil Siverhall
|
866c5c4188
|
removed redundant null check
|
2013-12-13 14:22:24 +01:00 |
|
Leo
|
1918f98880
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-13 13:33:13 +01:00 |
|
Emil Siverhall
|
2f68ff25ba
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-13 12:03:45 +01:00 |
|
Emil Siverhall
|
48117498f7
|
only show project types with degreeLevels FIRST_CYCLE and SECOND_CYCLE when submitting supervisor ideas
|
2013-12-13 11:33:36 +01:00 |
|
fred-fri
|
ec5cb11806
|
filtering only on supervisors with targets
|
2013-12-13 15:20:46 +09:00 |
|
Per Lundholm
|
95ad828bbc
|
Fixed some tests that lacked good data.
|
2013-12-12 17:18:41 +01:00 |
|
Per Lundholm
|
f69cfd757d
|
Moved logic to their panels.
|
2013-12-12 17:00:39 +01:00 |
|
|
|
cb477e2dcb
|
Set up default filter for lazy supervisors.
|
2013-12-12 15:58:42 +01:00 |
|
Leo
|
b3cde85899
|
Hides final seminar tab from project tab menu
|
2013-12-12 15:44:53 +01:00 |
|
niklas3
|
a497f5c2b0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 15:43:37 +01:00 |
|
niklas3
|
bd7c151b71
|
Partially removed dependency on ProjectBuilder.
|
2013-12-12 15:43:34 +01:00 |
|
niklas3
|
7879300eee
|
Partially removed dependency on ProjectBuilder.
|
2013-12-12 15:43:23 +01:00 |
|
Emil Siverhall
|
5cc49a6efe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 15:34:51 +01:00 |
|
Per Lundholm
|
d32f3c882d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 15:22:11 +01:00 |
|
Per Lundholm
|
a6c057563d
|
Removed entity Question as it contained only a String
|
2013-12-12 15:21:54 +01:00 |
|
Emil Siverhall
|
aff5c31d34
|
fixed some bad displays due to @Data annotation on ResearchArea and Unit
|
2013-12-12 14:44:21 +01:00 |
|
Emil Siverhall
|
7f06588439
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 14:23:18 +01:00 |
|
|
|
f2795bb090
|
Default filter for project type is now saved/loaded.
|
2013-12-12 14:01:12 +01:00 |
|
|
|
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 |
|
