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 |
|
Emil Siverhall
|
4a4d8ded8d
|
deleted FilterFormAreaPanel no longer being used
|
2013-12-12 13:58:49 +01:00 |
|
|
|
80a1b8c694
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 13:58:12 +01:00 |
|
Emil Siverhall
|
8fcf8e6c92
|
replaced FilterFormAreaPanel on supervisor idea pages
|
2013-12-12 13:53:49 +01:00 |
|
Emil Siverhall
|
0152cf45cd
|
replaced FilterFormAreaPanel on author - all supervisor ideas
|
2013-12-12 13:45:00 +01:00 |
|
Emil Siverhall
|
d3959a9fe5
|
replaced FilterFormAreaPanel on admin -> ideas and manage targets pages
|
2013-12-12 13:40:00 +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 |
|
|
|
c6cfd81dc4
|
Removed space to be consistent with CheckBoxMultipleChoice (add margin with input + label rule).
|
2013-12-12 13:29:48 +01:00 |
|
|
|
0e057114a4
|
Default filter for supervisor "role" is now saved/loaded.
|
2013-12-12 13:29:20 +01:00 |
|
|
|
6a75b921aa
|
Renamed ajaxUpdate to onUpdate to match standard Wicket naming.
|
2013-12-12 13:17:20 +01:00 |
|
|
|
a3834308b0
|
Removed surrounding paragraph.
|
2013-12-12 13:16:20 +01:00 |
|
|
|
5e20bb223f
|
Fixed basic styling.
|
2013-12-12 13:15:33 +01:00 |
|
|
|
81019da1ee
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 13:13:22 +01:00 |
|
|
|
3ec2dc6ed4
|
Fixed typo
|
2013-12-12 13:01:54 +01:00 |
|
|
|
1c21c6e6c8
|
Submitting the form cleared all other values so we're back to duplicated code.
|
2013-12-12 13:01:00 +01:00 |
|
Emil Siverhall
|
fc92c63f17
|
removed FilterFormUnitPanel since it could be easily replaced with an AjaxDropDownChoice
|
2013-12-12 12:05:35 +01:00 |
|
niklas3
|
5c999e59c6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 11:19:31 +01:00 |
|
niklas3
|
0c6441b6f6
|
Fixd test
|
2013-12-12 11:19:26 +01:00 |
|
|
|
cb58663505
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 11:15:29 +01:00 |
|
|
|
9efe618422
|
Refactor.
|
2013-12-12 11:14:08 +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 |
|
|
|
e07edbd65c
|
Added test to verify ajax updates the default selection in the users profile when changing project status filter.
|
2013-12-12 10:52:50 +01:00 |
|
|
|
6bd403d455
|
Added test to verify ajax updates the table when changing project status filter.
|
2013-12-12 10:50:55 +01:00 |
|
Emil Siverhall
|
f62b616a9e
|
project type selection mandatory when creating milestone activities
|
2013-12-12 10:50:17 +01:00 |
|
Emil Siverhall
|
a61d2c1600
|
filter changes on supervisors idea filters
|
2013-12-12 10:21:46 +01:00 |
|
Emil Siverhall
|
a1a802225d
|
filter changes on ideas- select supervisor idea
|
2013-12-12 10:13:59 +01:00 |
|
Emil Siverhall
|
7c54488f14
|
filter changes on peer stats panels
|
2013-12-12 10:09:56 +01:00 |
|
Emil Siverhall
|
566176b89e
|
filter changes on admin -> manage targets
|
2013-12-12 09:58:50 +01:00 |
|
|
|
8cb0671a88
|
Updates user profile based on filter selection.
|
2013-12-12 09:58:12 +01:00 |
|
Emil Siverhall
|
80be1949c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 09:52:49 +01:00 |
|
Emil Siverhall
|
713d5cd16f
|
filter changes on admin -> ideas and roles
|
2013-12-12 09:50:30 +01:00 |
|
|
|
09f6b94253
|
Removed useless annotation.
|
2013-12-12 09:44:14 +01:00 |
|
niklas3
|
2c23d04abb
|
Changed if condition on hidden opposition and active participation for ICT4D.
|
2013-12-12 09:42:57 +01:00 |
|
|
|
5d36254976
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 09:29:20 +01:00 |
|
|
|
e4df641f97
|
Loads default status selection from user profile.
|
2013-12-12 09:25:39 +01:00 |
|
fred-fri
|
f82e8188ac
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-12 17:22:46 +09:00 |
|
fred-fri
|
f7d0fd93fe
|
removed double feedback message
|
2013-12-12 17:22:11 +09:00 |
|
Emil Siverhall
|
f18c6face6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 08:47:32 +01:00 |
|
Emil Siverhall
|
e8e66b2b94
|
changed date format on participation/opposition page
|
2013-12-12 08:46:53 +01:00 |
|
fred-fri
|
a7c6f7bcbf
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-12-12 16:42:51 +09: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 |
|
Emil Siverhall
|
040738467b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-12 08:21:10 +01:00 |
|
fred-fri
|
3b577c4ae1
|
removing things named projectclass
|
2013-12-12 14:43:22 +09:00 |
|
fred-fri
|
1f7389487f
|
removing things named projectclass
|
2013-12-12 14:40:15 +09:00 |
|
fred-fri
|
224c74f359
|
renaming target projectclass to projecttype
|
2013-12-12 14:06:34 +09:00 |
|
