Merge lp:~bac/charms/precise/juju-gui/critical-fix into lp:~juju-gui/charms/precise/juju-gui/trunk

[Brad Crittenden]

Update charm_store_url to point to new location.

https://codereview.appspot.com/11525046/

[Brad Crittenden (bac)]

Reviewers: mp+176215_code.launchpad.net,

Message:
Please take a look.

Description:
Update charm_store_url to point to new location.

https://code.launchpad.net/~bac/charms/precise/juju-gui/critical-fix/+merge/176215

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/11525046/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision: <email address hidden>

Index: config/config.js.template
=== modified file 'config/config.js.template'
--- config/config.js.template 2013-07-15 17:37:21 +0000
+++ config/config.js.template 2013-07-22 14:45:30 +0000
@@ -10,7 +10,7 @@
    // These are the main application config items used and passed down into
all
    // SubApps.
    consoleEnabled: {{console_enabled}},
- charm_store_url: 'https://jujucharms.com/',
+ charm_store_url: 'https://manage.jujucharms.com/',
    charmworldURL: {{charmworld_url}},
    // socket_url is only honored in older versions of the GUI.
    socket_url: '{{raw_protocol}}://{{address}}/ws',

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/11525046/

[lp:~bac/charms/precise/juju-gui/critical-fix]

78. By Brad Crittenden on 2013-07-22

Bump revision

[Brad Crittenden (bac)]

Please take a look.

https://codereview.appspot.com/11525046/

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/11525046/

[Brad Crittenden (bac)]

*** Submitted:

Update charm_store_url to point to new location.

R=rharding
CC=
https://codereview.appspot.com/11525046

https://codereview.appspot.com/11525046/

=== modified file 'config/config.js.template'
--- config/config.js.template	2013-07-15 17:37:21 +0000
+++ config/config.js.template	2013-07-22 14:57:27 +0000
@@ -10,7 +10,7 @@
   // These are the main application config items used and passed down into all
   // SubApps.
   consoleEnabled: {{console_enabled}},
-  charm_store_url: 'https://jujucharms.com/',
+  charm_store_url: 'https://manage.jujucharms.com/',
   charmworldURL: {{charmworld_url}},
   // socket_url is only honored in older versions of the GUI.
   socket_url: '{{raw_protocol}}://{{address}}/ws',

=== modified file 'revision'
--- revision	2013-07-19 10:26:54 +0000
+++ revision	2013-07-22 14:57:27 +0000
@@ -1,1 +1,1 @@
-58
+59