← Back to branch summary

~ya-bo-ng/juju-gui/test-prototype

~ya-bo-ng/juju-gui/test-prototype

Viewing all changes in revision 82.5.6.

Committer: Francesco Banconi
Date: 2012-09-10 08:45:43 UTC
mfrom: (86 juju-ui)
mto: (86.1.1 bug-1049054-deploy-charm)
mto: This revision was merged to the branch mainline in revision 87.
Revision ID: francesco.banconi@canonical.com-20120910084543-x08u08p0pwazp50s

Merged trunk, resolved conflicts.

files added:
app/config.js

test/assets/mocha.css

test/assets/mocha.js

files removed:
app/views/status.js

lib/base.js

lib/views/index.handlebars

test/assets/mocha.css

test/assets/mocha.js

files renamed:
readme => README

files modified:
.bzrignore

Makefile

app/app.js

app/assets/javascripts/svg-layouts.js

app/assets/stylesheets/juju-gui.css

app/index.html

app/models/models.js

app/modules.js

app/store/charm.js

app/store/env.js

app/templates.js

app/views/charm.js

app/views/environment.js

app/views/search.js

app/views/service.js

app/views/unit.js

app/views/utils.js

config.js

jshint.config

lib/server.js

lib/templates.js

lib/view.js

lib/views/manifest.handlebars

lib/views/stylesheet.less

lib/views/templates.handlebars

manifest.json

package.json

server.js

test/index.html

test/test_app.js

test/test_env.js

test/test_model.js

Show diffs side-by-side

added added

removed removed

app/assets/javascripts/svg-layouts.js

app/assets/stylesheets/juju-gui.css

app/models/models.js

app/store/charm.js

app/store/env.js

app/templates.js

app/views/charm.js

app/views/environment.js

app/views/search.js

app/views/service.js

app/views/status.js

app/views/unit.js

app/views/utils.js

lib/templates.js

lib/views/index.handlebars

lib/views/manifest.handlebars

lib/views/stylesheet.less

lib/views/templates.handlebars

test/assets/mocha.css

test/assets/mocha.css@

test/assets/mocha.js

test/assets/mocha.js@

test/index.html

test/test_app.js

test/test_env.js

test/test_model.js

Older »