Merge branch 'develop' into feature/service-changes

2017-01-12 13:15:37 -05:00 · 2017-01-12 13:15:37 -05:00 · 6bd9663f59
commit 6bd9663f59
parent a49dee2416 c09170a7a7
136 changed files with 2470 additions and 1737 deletions
--- a/app/Http/Routes/AdminRoutes.php
+++ b/app/Http/Routes/AdminRoutes.php
@ -286,6 +286,11 @@ class AdminRoutes
                'as' => 'admin.nodes.delete',
                'uses' => 'Admin\NodesController@deleteNode',
            ]);
+
+            $router->get('/{id}/configurationtoken', [
+                'as' => 'admin.nodes.configuration-token',
+                'uses' => 'Admin\NodesController@getConfigurationToken',
+            ]);
        });

        // Location Routes