Merge pull request #598 from nextcloud/enh/dashboardWidget

Dashboard widget: Activity by others
nextcloud · Jul 6, 2021 · e6a40ce · e6a40ce
2 parents ed5ebfc + 0c61b99
commit e6a40ce
Show file tree

Hide file tree

Showing 13 changed files with 806 additions and 220 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
-js/dist/activity-sidebar.js binary
-js/dist/*.LICENCE.map binary
-js/dist/*.js.map binary
+js/activity-dashboard.js binary
+js/activity-sidebar.js binary
+js/*.LICENCE.map binary
+js/*.js.map binary
 package-lock.json binary
-src/test/__snapshots__/*.snap
+src/test/__snapshots__/*.snap
diff --git a/Makefile b/Makefile
@@ -34,8 +34,7 @@ ifeq (, $(composer))
 	php $(build_tools_directory)/composer.phar install --prefer-dist
 	php $(build_tools_directory)/composer.phar update --prefer-dist
 else
-	composer install --prefer-dist
-	composer update --prefer-dist
+	composer install
 endif
 
 npm-init: