← Back to branch summary

~allenap/maas/virt-detect-nonzero--bug-1591958

~allenap/maas/virt-detect-nonzero--bug-1591958

Viewing all changes in revision 3523.

Committer: MaaS Lander
Author(s): Blake Rouse, ricgard, Gavin Panella
Date: 2015-02-18 02:57:04 UTC
mfrom: (3434.2.31 angular-integration)
Revision ID: maas_lander-20150218025704-asrvc8w01bi9xm0z

[r=blake-rouse][bug=][author=maas-maintainers] Merge the AngularJS integration branch. Enables the new node listing using AngularJS.

files added:
run-e2e

src/maasserver/static/js/angular

src/maasserver/static/js/angular/controllers

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/tests

src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js

src/maasserver/static/js/angular/factories

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/region.js

src/maasserver/static/js/angular/factories/tests

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/factories/tests/test_region.js

src/maasserver/static/js/angular/filters

src/maasserver/static/js/angular/filters/nodes.js

src/maasserver/static/js/angular/filters/tests

src/maasserver/static/js/angular/filters/tests/test_nodes.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/js/angular/services

src/maasserver/static/js/angular/services/search.js

src/maasserver/static/js/angular/services/tests

src/maasserver/static/js/angular/services/tests/test_search.js

src/maasserver/static/js/angular/testing

src/maasserver/static/js/angular/testing/utils.js

src/maasserver/static/js/angular/testing/websocket.js

src/maasserver/static/partials

src/maasserver/static/partials/nodes-list.html

src/maasserver/tests/test_triggers.py

src/maasserver/triggers.py

src/maasserver/views/index.py

src/maasserver/views/tests/test_index.py

src/maasserver/websockets/base.py

src/maasserver/websockets/handlers

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests

src/maasserver/websockets/handlers/tests/test_node.py

src/maasserver/websockets/handlers/tests/test_timestampedmodel.py

src/maasserver/websockets/handlers/timestampedmodel.py

src/maasserver/websockets/listener.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/karma.conf.js

src/maastesting/karma.py

src/maastesting/protractor

src/maastesting/protractor/__init__.py

src/maastesting/protractor/clusterd.yaml

src/maastesting/protractor/protractor.conf.js

src/maastesting/protractor/runner.py

src/maastesting/protractor/tests

src/maastesting/protractor/tests/test_login.js

files removed:
src/maasserver/static/js/node_add.js

src/maasserver/static/js/nodes_chart.js

src/maasserver/static/js/tests/test_node_add.html

src/maasserver/static/js/tests/test_node_add.js

src/maasserver/static/js/tests/test_nodes_chart.html

src/maasserver/static/js/tests/test_nodes_chart.js

src/maasserver/templates/maasserver/node_list.html

src/maasserver/views/tests/test_snippets.py

files renamed:
src/maasserver/fixtures/selenium_tests_fixture.yaml => src/maastesting/protractor/fixture.yaml

files modified:
Makefile

buildout.cfg

required-packages/base

required-packages/dev

src/maas/settings.py

src/maasserver/context_processors.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/middleware.py

src/maasserver/models/node.py

src/maasserver/start_up.py

src/maasserver/static/js/node_views.js

src/maasserver/static/js/tests/test_node_views.js

src/maasserver/static/scss/maas/components/_flashmessages.scss

src/maasserver/static/scss/maas/layout/_footers.scss

src/maasserver/static/scss/maas/layout/_grids.scss

src/maasserver/static/scss/maas/pages/_nodes.scss

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/templates/maasserver/network_detail.html

src/maasserver/templates/maasserver/network_list.html

src/maasserver/templates/maasserver/zone_list.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_webapp.py

src/maasserver/urls.py

src/maasserver/urls_combo.py

src/maasserver/utils/forms.py

src/maasserver/views/networks.py

src/maasserver/views/nodes.py

src/maasserver/views/tests/test_combo.py

src/maasserver/views/tests/test_general.py

src/maasserver/views/tests/test_networks.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_zones.py

src/maasserver/views/zones.py

src/maasserver/webapp.py

src/maasserver/websockets/tests/test_websockets.py

src/maasserver/websockets/websockets.py

src/maastesting/fixtures.py

src/maastesting/tests/test_conflict_markers.py

Show diffs side-by-side

added added

removed removed

required-packages/base

required-packages/dev

src/maas/settings.py

src/maasserver/context_processors.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/middleware.py

src/maasserver/models/node.py

src/maasserver/start_up.py

src/maasserver/static/js/angular/

src/maasserver/static/js/angular/controllers/

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/tests/

src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js

src/maasserver/static/js/angular/factories/

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/region.js

src/maasserver/static/js/angular/factories/tests/

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/factories/tests/test_region.js

src/maasserver/static/js/angular/filters/

src/maasserver/static/js/angular/filters/nodes.js

src/maasserver/static/js/angular/filters/tests/

src/maasserver/static/js/angular/filters/tests/test_nodes.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/js/angular/services/

src/maasserver/static/js/angular/services/search.js

src/maasserver/static/js/angular/services/tests/

src/maasserver/static/js/angular/services/tests/test_search.js

src/maasserver/static/js/angular/testing/

src/maasserver/static/js/angular/testing/utils.js

src/maasserver/static/js/angular/testing/websocket.js

src/maasserver/static/js/node_add.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/nodes_chart.js

src/maasserver/static/js/tests/test_node_add.html

src/maasserver/static/js/tests/test_node_add.js

src/maasserver/static/js/tests/test_node_views.js

src/maasserver/static/js/tests/test_nodes_chart.html

src/maasserver/static/js/tests/test_nodes_chart.js

src/maasserver/static/partials/

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/scss/maas/components/_flashmessages.scss

src/maasserver/static/scss/maas/layout/_footers.scss

src/maasserver/static/scss/maas/layout/_grids.scss

src/maasserver/static/scss/maas/pages/_nodes.scss

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/templates/maasserver/network_detail.html

src/maasserver/templates/maasserver/network_list.html

src/maasserver/templates/maasserver/node_list.html

src/maasserver/templates/maasserver/zone_list.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_triggers.py

src/maasserver/tests/test_webapp.py

src/maasserver/triggers.py

src/maasserver/urls.py

src/maasserver/urls_combo.py

src/maasserver/utils/forms.py

src/maasserver/views/index.py

src/maasserver/views/networks.py

src/maasserver/views/nodes.py

src/maasserver/views/tests/test_combo.py

src/maasserver/views/tests/test_general.py

src/maasserver/views/tests/test_index.py

src/maasserver/views/tests/test_networks.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_snippets.py

src/maasserver/views/tests/test_zones.py

src/maasserver/views/zones.py

src/maasserver/webapp.py

src/maasserver/websockets/base.py

src/maasserver/websockets/handlers/

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/

src/maasserver/websockets/handlers/tests/test_node.py

src/maasserver/websockets/handlers/tests/test_timestampedmodel.py

src/maasserver/websockets/handlers/timestampedmodel.py

src/maasserver/websockets/listener.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maasserver/websockets/tests/test_websockets.py

src/maasserver/websockets/websockets.py

src/maastesting/fixtures.py

src/maastesting/karma.conf.js

src/maastesting/karma.py

src/maastesting/protractor/

src/maastesting/protractor/__init__.py

src/maastesting/protractor/clusterd.yaml

src/maastesting/protractor/protractor.conf.js

src/maastesting/protractor/runner.py

src/maastesting/protractor/tests/

src/maastesting/protractor/tests/test_login.js

src/maastesting/tests/test_conflict_markers.py

Older »