From f44500f77af159aeb9f86aa23ecfbdd321ee5277 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 22 Jun 2016 16:58:06 +0200 Subject: Init the headers in iedavclient.js --- core/js/files/iedavclient.js | 1 + 1 file changed, 1 insertion(+) diff --git a/core/js/files/iedavclient.js b/core/js/files/iedavclient.js index 9e83f5b9a22..a0185fb3bec 100644 --- a/core/js/files/iedavclient.js +++ b/core/js/files/iedavclient.js @@ -29,6 +29,7 @@ var self = this; var xhr = this.xhrProvider(); + headers = headers || {}; if (this.userName) { headers['Authorization'] = 'Basic ' + btoa(this.userName + ':' + this.password); -- cgit v1.2.3 From 3128a2c03e27bdf5ed0106c25e7c59567238d633 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 24 Jun 2016 11:31:29 +0200 Subject: Fix search result link for file results outside default list When outside the "All files" list, the search result link must properly redirect to the "All files" list. --- apps/files/js/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/js/search.js b/apps/files/js/search.js index 394bcb48603..d35cacfa402 100644 --- a/apps/files/js/search.js +++ b/apps/files/js/search.js @@ -133,7 +133,7 @@ this.handleFolderClick = function($row, result, event) { // open folder - if (self.fileAppLoaded()) { + if (self.fileAppLoaded() && self.fileList.id === 'files') { self.fileList.changeDirectory(result.path); return false; } else { @@ -142,7 +142,7 @@ }; this.handleFileClick = function($row, result, event) { - if (self.fileAppLoaded()) { + if (self.fileAppLoaded() && self.fileList.id === 'files') { self.fileList.changeDirectory(OC.dirname(result.path)); self.fileList.scrollTo(result.name); return false; -- cgit v1.2.3 From fd05ff03928a24085c4d67e26780a368d137c6ff Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 24 Jun 2016 11:32:14 +0200 Subject: Hide search results after switching directory When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. --- apps/files/js/search.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/files/js/search.js b/apps/files/js/search.js index d35cacfa402..625e4b13f4b 100644 --- a/apps/files/js/search.js +++ b/apps/files/js/search.js @@ -184,6 +184,13 @@ search.setHandler('folder', this.handleFolderClick.bind(this)); search.setHandler(['file', 'audio', 'image'], this.handleFileClick.bind(this)); + + if (self.fileAppLoaded()) { + // hide results when switching directory outside of search results + $('#app-content').delegate('>div', 'changeDirectory', function() { + search.clear(); + }); + } } }; OCA.Search.Files = Files; -- cgit v1.2.3 From 735411d1661f9b62efa4601254ef985a1e90ee76 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 29 Jun 2016 11:17:57 +0200 Subject: ownCloud 9.0.3 --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 5e9923f9572..edf6202c687 100644 --- a/version.php +++ b/version.php @@ -26,10 +26,10 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 0, 3, 1); +$OC_Version = array(9, 0, 3, 2); // The human readable string -$OC_VersionString = '9.0.3 RC1'; +$OC_VersionString = '9.0.3'; $OC_VersionCanBeUpgradedFrom = array(8, 2); -- cgit v1.2.3