lp:~gary/juju-gui/bug1090716

Branch merges

Rejected for merging into lp:juju-gui/experimental

Juju GUI Hackers: Pending requested 2013-01-10

Diff: 394 lines (+286/-15)

5 files modified

app/views/topology/relation.js (+10/-0)
app/views/topology/service.js (+23/-14)
app/views/utils.js (+79/-1)
test/test_environment_view.js (+70/-0)
test/test_utils.js (+104/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1090716: GUI should protect GUI charm

High

Fix Released

Link a bug report

Related blueprints

315. By Gary Poster on 2013-01-10

Mark branch as fixing bug 1090716

314. By Gary Poster on 2013-01-10

lint

313. By Gary Poster on 2013-01-10

make test work, and make hiding unofficial juju-gui charms work.

312. By Gary Poster on 2013-01-10

merge trunk

311. By Gary Poster on 2013-01-10

fix tests

310. By Nicola Larosa on 2013-01-10

Merge from trunk.

309. By Nicola Larosa on 2013-01-10

Some cleanup, added commented code for interface tests.

308. By Nicola Larosa on 2013-01-10

Merge from trunk, one conflict resolved.

307. By Benji York on 2013-01-09

checkpoint; working and tested; still needs functional tests

306. By Brad Crittenden on 2013-01-09

Add support for _annotation calls to env.

The calls update_annotations, get_annotations, and remove_annotations are
added to the env object.

As a drive-by, in test_env.js the unnecessary use of async calls was
eliminated by removing the 'done' parameter. Leaving it in place where not
required was confusing.

R=gary.poster, hazmat
CC=
https://codereview.appspot.com/7064060