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 |
|
fred-fri
|
7876be9709
|
renamed projectclasssettings projecttypesettings
|
2013-12-12 13:43:58 +09:00 |
|
Emil Siverhall
|
7253c80691
|
replaced last occurrence of FilterFormCheckBoxPanel and deleted the class
|
2013-12-11 22:00:36 +01:00 |
|
Emil Siverhall
|
9fba54a578
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 17:20:46 +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 |
|
Emil Siverhall
|
cea3f859ce
|
replaced FilterFormCheckboxPanel on AdminRolePage
|
2013-12-11 17:07:55 +01:00 |
|
Emil Siverhall
|
b5335f7686
|
replaced FilterFormCheckboxPanel on ProjectDataPanel
|
2013-12-11 16:54:29 +01:00 |
|
Emil Siverhall
|
832de7c068
|
replaced FilterFormCheckboxPanel on AdminFinalSeminarExemptionPage
|
2013-12-11 16:44:11 +01:00 |
|
Emil Siverhall
|
b6ec2c87e0
|
replaced FilterFormCheckboxPanel on SupervisorAllStudentIdeasPanel
|
2013-12-11 16:33:14 +01:00 |
|
Emil Siverhall
|
c7d658d9cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 16:23:20 +01:00 |
|
Emil Siverhall
|
56ec336e73
|
replaced FilterFormCheckboxPanel on ProjectAllSupervisorIdeasPanel (renamed panel as well)
|
2013-12-11 16:23:00 +01:00 |
|
niklas3
|
73cffa4477
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 16:17:40 +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 |
|
Emil Siverhall
|
3f75dfa29c
|
replaced FilterFormCheckboxPanel on PeerReviewListPanel/PeerRequestListPanel
|
2013-12-11 16:07:42 +01:00 |
|
|
|
7cb9c92df4
|
Updated status filter to use better wicket components.
|
2013-12-11 16:07:34 +01:00 |
|
|
|
6c53fb9172
|
Updated role filter to use better wicket components.
|
2013-12-11 15:56:47 +01:00 |
|
|
|
d13d6bb532
|
Added constructor that does not require default selection to AjaxCheckBoxMultipleChoice.
|
2013-12-11 15:54:44 +01:00 |
|
Emil Siverhall
|
e71c419122
|
replaced FilterFormCheckboxPanel on ManageTargetsPanel
|
2013-12-11 15:49:39 +01:00 |
|
Emil Siverhall
|
d33b70fe97
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 15:40:53 +01:00 |
|
Emil Siverhall
|
834d13b716
|
removed use of FilterFormCheckboxPanel on Admin->Match->Ideas
|
2013-12-11 15:40:43 +01:00 |
|
|
|
403585d3f6
|
Added checkbox to toggle supervisor only filter.
|
2013-12-11 15:14:25 +01:00 |
|
niklas3
|
6eb0f2caa7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:59:56 +01:00 |
|
