summaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-05-29 21:28:47 +0200
committerLukas Reschke <lukas@statuscode.ch>2014-05-29 21:28:47 +0200
commit705242d3903034c148b4ad7c717d52be592f3e6d (patch)
treef4d1f1fe7230f9c8fb5e5747aa1719c9d377d8a4 /core/js/js.js
parent32a50563d3a93c304d7879212f349e6930d5b5d6 (diff)
parent7e055a94044100c17ffa103c56e2d238f9b4e6ac (diff)
downloadnextcloud-server-705242d3903034c148b4ad7c717d52be592f3e6d.tar.gz
nextcloud-server-705242d3903034c148b4ad7c717d52be592f3e6d.zip
Merge pull request #8727 from owncloud/upgrade-overview
Added update overview page
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index fde6018e9f4..3c3efc469bf 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -175,9 +175,13 @@ var OC={
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
PERMISSION_ALL:31,
+ /* jshint camelcase: false */
webroot:oc_webroot,
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
+ config: oc_config,
+ appConfig: oc_appconfig || {},
+ theme: oc_defaults || {},
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**