0d41138c6e
prevent recursion when moving a file to the trashbin
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-13 11:42:01 +01:00
389c2095a6
Use dependency injection for app manager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 00:42:39 +01:00
9bb13fb05f
Created infrastructure to show circles' shared files
...
There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it.
Issue: https://github.com/nextcloud/circles/issues/137
Changes to comply to https://github.com/coletivoEITA/circles/pull/2
Polishing: get files shared to circles in caldav
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 00:31:38 +01:00
f0c85a0f5f
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
...
Change CALDAV to allow calendars be shared with circles.
2019-03-13 00:06:46 +01:00
5cc5107cba
Fix PHPUnit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-12 18:41:37 +01:00
c8aad3db81
Fix PHPUnit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-12 18:27:59 +01:00
e8739e1392
Remove sensitive SMB arguments from exception log
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-12 15:51:38 +01:00
ed0e3d305e
remove dangling space
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-12 15:30:03 +01:00
1bfbfb2c5b
fix database select styling in setup page
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-12 15:25:55 +01:00
a0792137cf
Rename the variable aswell
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-12 13:48:05 +01:00
33c34ddafa
Merge pull request #14626 from nextcloud/bugfix/14621/make-sure-urlparams-are-correctly-injected-in-global-routes
...
Make sure urlparams are correctly injected in global routes
2019-03-12 12:46:54 +01:00
9306caec3e
Add border around previews in grid view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-03-12 10:44:51 +01:00
aff13a2072
Merge pull request #14586 from nextcloud/hint-user-docs-federation
...
Add hint to user documentation (Federation)
2019-03-11 20:03:29 +01:00
c9026fc75c
Fix plural rule detection for languages
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-11 15:19:23 +01:00
1832537571
Merge pull request #14623 from nextcloud/fix/noid/login-page-wrong-password
...
Fix acceptance tests for wrong password message due to changed message
2019-03-11 12:49:05 +01:00
89ed84e8b6
Fix display of i in personal settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-11 12:47:14 +01:00
ab488a49d0
Add hint to user documentation (Federation)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-11 12:47:14 +01:00
a3c9e5b11b
Add a message about disabled global routes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-11 12:43:39 +01:00
4e8b033281
Make sure urlParams are correctly injected in global routes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-11 12:30:44 +01:00
065690dcf5
Merge pull request #14620 from nextcloud/fix/noid/copy-paste-typo
...
Fix unneeded doc link to unrelated resource
2019-03-11 12:01:27 +01:00
77cf702220
Fix acceptance tests for wrong password message due to changed message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-11 11:54:38 +01:00
25d700ef30
Fix unneeded doc link to unrelated resource
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-11 11:00:21 +01:00
d40b21ac81
Merge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp-path
...
Show a setup warning in case S3 object storage is used as primary storage
2019-03-08 18:03:49 +01:00
8996b9efbf
Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1
...
[Security] Bump bootstrap from 3.4.1 to 4.3.1
2019-03-08 15:32:16 +01:00
060b637b70
Show a setup warning in case S3 object storage is used as primary storage
...
* checks for at least 50 GB of free space
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-08 13:38:39 +01:00
ec5f4200ad
Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation
...
Avoid duplicate App container creation
2019-03-08 10:31:10 +01:00
592975bf64
Merge pull request #14590 from Worteks/master
...
Update index.php
2019-03-08 09:45:33 +01:00
49c7799496
Merge pull request #14585 from nextcloud/ocm-mention-federation
...
Mention Open Cloud Mesh in Federated User Settings
2019-03-08 09:42:22 +01:00
de935848a4
Merge pull request #14589 from nextcloud/feature/noid/add-preview-information-as-optional-data
...
Add preview data as optional data for files
2019-03-08 09:41:33 +01:00
772303309d
Merge pull request #14425 from cowai/fix-multiple-incomplete-folders
...
Do not calculate folder size for parent that also needs proper scan, fixes #3524
2019-03-08 09:12:33 +01:00
70aa85997d
Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundle
...
Remove Google+ from Social Sharing Bundle
2019-03-08 09:05:07 +01:00
3f8235da62
Merge pull request #14583 from nextcloud/remove-g+-federation
...
Remove Google+ federation usersettings
2019-03-08 09:04:01 +01:00
3af7f2c2ea
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter
...
resolve user and groups in nested groups first before filtering the results
2019-03-07 22:31:51 +01:00
38eccce224
Update index.php
...
Linking to NC 15 documentation instead of NC 13
2019-03-07 22:05:38 +01:00
e4cffa00df
Add preview data as optional data for files
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-07 19:47:40 +01:00
f7ea96f56a
Remove Google+ from Social Sharing Bundle (2)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 14:57:56 +01:00
80937159fb
Remove "socialsharing_googleplus" from Social Sharing Bundle
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 14:56:16 +01:00
993e15b72c
Remove G+ CSS rule (Feedback from Joas)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 14:28:36 +01:00
6c2b80170e
Mention Open Cloud Mesh in Federated User Settings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:55:09 +01:00
bdad72dfa9
Remove G+ code from Federated Files Sharing-usersettings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:46:49 +01:00
500986f30e
Remove G+ icon from Federated Files Sharing-usersettings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:45:23 +01:00
7ff1f8366a
Merge pull request #14579 from nextcloud/fix/bump_streams_files_external
...
Have streams of files_external in sync
2019-03-07 12:53:07 +01:00
bb3c3539cc
Have streams of files_external in sync
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-07 12:15:32 +01:00
9e3335f11e
Bump bundles
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:48:26 +01:00
496a668bd4
Add wrapper for removed tooltip functions
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:48:26 +01:00
d768634616
Fix domparser on phantomjs
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:45:47 +01:00
067651b715
Use tooltip dist file
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:45:47 +01:00
e6ab850aac
Fix tooltip styling for bootstrap 4.3
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:45:47 +01:00
b2be083c5e
Fix tooltip include
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-07 10:45:47 +01:00
f739cabe2b
[Security] Bump bootstrap from 3.4.1 to 4.3.1
...
Bumps [bootstrap](https://github.com/twbs/bootstrap ) from 3.4.1 to 4.3.1. **This update includes security fixes.**
- [Release notes](https://github.com/twbs/bootstrap/releases )
- [Commits](https://github.com/twbs/bootstrap/compare/v3.4.1...v4.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07 10:45:46 +01:00
Robin Appelman
Morris Jobke
Vinicius Cubas Brand
Joas Schilling
Jan-Christoph Borchardt
Marius Blüm
Roeland Jago Douma
blizzz
paul
Roeland Jago Douma
Julius Härtl
dependabot[bot]