summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-07-13 17:25:51 +0200
committerGitHub <noreply@github.com>2018-07-13 17:25:51 +0200
commit14314584ba88ed8d8a7c8486b61c6677a14271f2 (patch)
treea24439cf1b1c243318532322d52d89fe4530fc47 /apps/files
parent1801e4e03f3a0b5ef253d67c13702b0fa22578a3 (diff)
parentca6094f3900fd463449d9973589b1d49aed28b2a (diff)
downloadnextcloud-server-14314584ba88ed8d8a7c8486b61c6677a14271f2.tar.gz
nextcloud-server-14314584ba88ed8d8a7c8486b61c6677a14271f2.zip
Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-users
Display What's New info to users
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/css/merged.scss1
-rw-r--r--apps/files/js/app.js2
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/css/merged.scss b/apps/files/css/merged.scss
index d65bac512f1..8a11e55c269 100644
--- a/apps/files/css/merged.scss
+++ b/apps/files/css/merged.scss
@@ -2,3 +2,4 @@
@import 'upload.scss';
@import 'mobile.scss';
@import 'detailsView.scss';
+@import '../../../core/css/whatsnew.scss';
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 52c92645b2d..c2cef563fa0 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -133,6 +133,8 @@
});
this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200);
+
+ OCP.WhatsNew.query(); // for Nextcloud server
},
/**