~bjornt/maas:peer-proxy-ui

Branch merges

Propose for merging

Merged into maas:master

Blake Rouse (community): Approve on 2017-07-26

Andres Rodriguez (community): Needs Fixing on 2017-07-21

Diff: 582 lines (+410/-14)

10 files modified

Makefile (+1/-0)
src/maasserver/forms/__init__.py (+11/-2)
src/maasserver/static/js/angular/directives/proxy_settings.js (+41/-0)
src/maasserver/static/js/angular/directives/tests/test_proxy_settings.js (+190/-0)
src/maasserver/static/partials/proxy-settings.html (+48/-0)
src/maasserver/templates/maasserver/settings.html (+38/-4)
src/maasserver/views/combo.py (+1/-0)
src/maasserver/views/settings.py (+22/-4)
src/maasserver/views/tests/test_settings.py (+45/-2)
src/maastesting/karma.conf.js (+13/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

4b3a4a0... by Björn Tillenius on 2017-07-27

Format imports.

8c40526... by Björn Tillenius on 2017-07-27

Use {? instead of {{

e700f3f... by Björn Tillenius on 2017-07-27

Address review comments from design.

3c7e2c3... by Björn Tillenius on 2017-07-24

Remove unused function.

34614db... by Björn Tillenius on 2017-07-24

Improve the Javascript tests.

abe461b... by Björn Tillenius on 2017-07-24

Add more Javascript tests.

7b92f01... by Björn Tillenius on 2017-07-21

Fix test.

23b93c9... by Björn Tillenius on 2017-07-21

Fix wording.

8f358d4... by Björn Tillenius on 2017-07-21

Fix copyright year.

7d4afd6... by Björn Tillenius on 2017-07-21

Remove debugger statement.