diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-01-15 20:41:57 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-01-15 20:41:57 +0100 |
| commit | 1b671afa17b3735a2b78ebca8a5093c5c040c7a2 (patch) | |
| tree | 63af6ebd537334e7bbcd6712d944312f3dd27806 /core/js | |
| parent | 9b4d5b502fcdba004c3ee95dd6d395f437a5e5dc (diff) | |
| parent | dc17019536551915e4417b08904e9fb5f6f49689 (diff) | |
| download | nextcloud-server-1b671afa17b3735a2b78ebca8a5093c5c040c7a2.tar.gz nextcloud-server-1b671afa17b3735a2b78ebca8a5093c5c040c7a2.zip | |
Merge pull request #13323 from owncloud/move-search
Move search to core/search
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/core.json | 2 | ||||
| -rw-r--r-- | core/js/js.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json index 101a88cd4f0..2fb7842624c 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -23,6 +23,6 @@ "config.js", "multiselect.js", "oc-requesttoken.js", - "../../search/js/search.js" + "../search/js/search.js" ] } diff --git a/core/js/js.js b/core/js/js.js index 579bf09b2e4..234cc328dfb 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -74,7 +74,7 @@ var OC={ config: window.oc_config, appConfig: window.oc_appconfig || {}, theme: window.oc_defaults || {}, - coreApps:['', 'admin','log','search','settings','core','3rdparty'], + coreApps:['', 'admin','log','core/search','settings','core','3rdparty'], menuSpeed: 100, /** |