Merge branch 'master' into fix/elastic#1962

src/kibana/partials/saved_object_finder.html

@@ -14,7 +14,7 @@
       <span class="finder-hit-count"><strong>{{hitCount}}</strong> {{type}}</span>
   </div>
 </form>
-<paginate list="hits" per-page="5">
+<paginate list="hits | orderBy:'title'" per-page="5">
   <ul class="list-group list-group-menu">
     <a class="list-group-item list-group-menu-item"
       ng-repeat="hit in page"

src/kibana/plugins/settings/sections/objects/_objects.html

@@ -23,7 +23,7 @@ <h2>Edit Saved Objects</h2>
       </div>
       <div ng-repeat="service in services" ng-class="{ active: state.tab === service.title }" class="tab-pane">
         <ul class="list-unstyled">
-          <li class="item" ng-repeat="item in service.data">
+          <li class="item" ng-repeat="item in service.data | orderBy:'title'">
             <div class="actions pull-right">
               <button
                 ng-click="edit(service, item)"

src/server/routes/proxy.js

@@ -40,15 +40,19 @@ function getPort(req) {
 router.use(function (req, res, next) {
 
   var uri = _.defaults({}, target);
+
+  // Add a slash to the end of the URL so resolve doesn't remove it.
+  var path = (/\/$/.test(uri.path)) ? uri.path : uri.path + '/';
+  path = url.resolve(path, '.' + req.url);
+
   var options = {
-    url: uri.protocol + '//' + uri.host + req.url,
+    url: uri.protocol + '//' + uri.host + path,
     method: req.method,
     headers: _.defaults({ host: target.hostname }, req.headers),
     strictSSL: config.kibana.verify_ssl,
     timeout: config.kibana.request_timeout
   };
 
-
   options.headers['x-forward-for'] = req.connection.remoteAddress || req.socket.remoteAddress;
   options.headers['x-forward-port'] = getPort(req);
   options.headers['x-forward-proto'] = req.connection.pair ? 'https' : 'http';