stable

Clone or download

Read-only

Merge commit 'refs/changes/42/4242/4' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: story #8218: View mode is persisted in user preference by project Conflicts: src/common/autoload.php Change-Id: Ib3faffa68bc6bcd6a7a2038ebac79736b5be2df0

Modified Files

Name
M plugins/agiledashboard/include/AgileDashboard/Milestone/Pane/Planning/PlanningV2Presenter.class.php +11 −3 Go to diff View file
M plugins/agiledashboard/templates/pane-planning-v2.mustache +1 −1 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/app-main-controller.js +3 −1 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/app-planning-controller.js +30 −10 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/app-planning-controller.spec.js +12 −2 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/app.js +1 −0 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/backlog-item/backlog-item.less +1 −1 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/planning.tpl.html +2 −2 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/src/app/shared-properties/shared-properties-service.js +24 −2 Go to diff View file
A plugins/agiledashboard/www/js/planning-v2/src/app/user-preferences/user-preferences-service.js +26 −0 Go to diff View file
A plugins/agiledashboard/www/js/planning-v2/src/app/user-preferences/user-preferences.js +1 −0 Go to diff View file
M src/common/REST/Header.class.php +1 −1 Go to diff View file
M src/common/autoload.php +3 −2 Go to diff View file
A src/common/user/REST/v1/UserPreferenceRepresentation.class.php +40 −0 Go to diff View file
M src/common/user/REST/v1/UserResource.php +38 −0 Go to diff View file
M tests/rest/UsersTest.php +19 −0 Go to diff View file