Merge branch 'master' of github.com:vanilla/addons

vanilla · Oct 7, 2015 · 88976ad · 88976ad
2 parents 58012cd + 8da6121
commit 88976ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/plugins/Pockets/class.pockets.plugin.php b/plugins/Pockets/class.pockets.plugin.php
@@ -17,7 +17,7 @@
    'AuthorEmail' => 'todd@vanillaforums.com',
    'AuthorUrl' => 'http://vanillaforums.org/profile/todd',
    'RequiredApplications' => array('Vanilla' => '2.1'),
-   'RegisterPermissions' => array('Plugins.Pockets.Manage', 'Garden.NoAds.Allow'),
+   'RegisterPermissions' => array('Plugins.Pockets.Manage' => 'Garden.Settings.Manage', 'Garden.NoAds.Allow'),
    'SettingsUrl' => '/settings/pockets',
    'SettingsPermission' => 'Plugins.Pockets.Manage',
    'MobileFriendly' => TRUE,

diff --git a/plugins/jsconnect/views/settings.php b/plugins/jsconnect/views/settings.php
@@ -3,8 +3,8 @@
     <?php
     echo '<h2>', T('Need More Help?'), '</h2>';
     echo '<ul>';
-    echo '<li>', Anchor(T('jsConnect Documentation'), 'http://vanillaforums.org/docs/jsconnect'), '</li>';
-    echo '<li>', Anchor(T('jsConnect Client Libraries'), 'http://vanillaforums.org/docs/jsconnect#libraries'), '</li>';
+    echo '<li>', Anchor(T('jsConnect Documentation'), 'http://docs.vanillaforums.com/features/sso/jsconnect/'), '</li>';
+    echo '<li>', Anchor(T('jsConnect Client Libraries'), 'http://docs.vanillaforums.com/features/sso/jsconnect/overview/#your-endpoint'), '</li>';
     echo '</ul>';
     ?>
 </div>

diff --git a/plugins/jsconnect/views/settings_addedit.php b/plugins/jsconnect/views/settings_addedit.php
@@ -3,8 +3,8 @@
         <?php
         echo '<h2>', T('Need More Help?'), '</h2>';
         echo '<ul>';
-        echo '<li>', Anchor(T('jsConnect Documentation'), 'http://vanillaforums.org/docs/jsconnect'), '</li>';
-        echo '<li>', Anchor(T('jsConnect Client Libraries'), 'http://vanillaforums.org/docs/jsconnect#libraries'), '</li>';
+        echo '<li>', Anchor(T('jsConnect Documentation'), 'http://docs.vanillaforums.com/features/sso/jsconnect/'), '</li>';
+        echo '<li>', Anchor(T('jsConnect Client Libraries'), 'http://docs.vanillaforums.com/features/sso/jsconnect/overview/#your-endpoint'), '</li>';
         echo '</ul>';
         ?>
     </div>