Commit Graph

18398 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) 33f85f64c7
Always show menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv) d86c1e9503
Disable sidebar on deleted share
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv) 3b835d8076
Js magic for deleted shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv) 6a0552224d
getDeletedSharedWith method
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma d805959e81
Add API to undelete delete group shares
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:56 +02:00
Arthur Schiwon 846ab25fc0
adjust and add more unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 11:50:49 +02:00
Arthur Schiwon 343036e55c
allow admin to disable fetching of avatars as well as a specific attribute
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 11:12:51 +02:00
blizzz 42912a0e25
Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-format
LDAP user should be able to set avatar if directory provides incompatible image
2018-07-04 14:37:21 +02:00
Morris Jobke 16d5883680
Merge pull request #10101 from nextcloud/papercut/10094/oauth_table
Do not show OAuth2 table if it is empty
2018-07-04 11:22:56 +02:00
Roeland Jago Douma c92fe76f77
Merge pull request #10065 from nextcloud/rakekniven-patch-1
Update SettingsController.php
2018-07-04 08:26:27 +02:00
Roeland Jago Douma ba08019429
Do not show OAuth2 table if it is empty
For #10094

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:23:21 +02:00
Morris Jobke 7025f16017
Merge pull request #9345 from nextcloud/federation20
Federation 2.0
2018-07-03 23:13:47 +02:00
Robin Appelman 27089422e1
Improved logging of smb connection errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 14:56:37 +02:00
Arthur Schiwon a4dda465c2
let user set avatar in nextcloud von LDAP provides invalid image data
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 01:45:07 +02:00
Arthur Schiwon 552da85df8
Iron User_LDAP tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 00:29:34 +02:00
Morris Jobke 6e9dbe7d15
Merge pull request #10078 from nextcloud/bugfix/activity-277/invalid-actor-and-calendar-for-link-shares
Correctly parse the subject parameters for link (un)shares of calendars
2018-07-02 15:43:36 +02:00
Morris Jobke fe807823d2
Merge pull request #10077 from nextcloud/lazy-search-fix
Fix lazy search backend
2018-07-02 15:37:29 +02:00
Joas Schilling a0a6aff772
Correctly parse the subject parameters for link (un)shares of calendars
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-02 13:57:48 +02:00
Robin Appelman 1f9f5e2e5e
Fix lazy search backend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-02 13:42:41 +02:00
Bjoern Schiessle ce567b6121
remove unused code
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle cdf8abb060
look for correct OCM permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle 086e7a0aa2
remove debug output 2018-07-02 11:29:31 +02:00
Bjoern Schiessle cfb3e80d1b
remove the makefile 2018-07-02 11:29:31 +02:00
Bjoern Schiessle 8d4da30bf5
add support for different share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle 5c8b26248b
let the actual federated share provider check if incoming/outgoing shares are enabled for the specific resource type
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 22d9246134
send the display name back after a federated share was received
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 27814127dd
make sure that remote url gets stored with a trailing '/'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 21b8a873d5
implement config check
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 9365fd2534
fix external manager tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 2e19213695
fix notification tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 9d145bb5dd
update tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 5d0d33a0d4
remove unused method
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 84fc188dfc
some minor fixes and clode cleanup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 61485e3e60
fix check for reshare permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle ed415726d3
send RESHARE_CHANGE_PERMISSION message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 2bb1956c1f
implement RESHARE_UNDO notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications
- Don't send message to owner/sharer about revoked re-shares twice.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle a176a1f318
implement unshare notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle fab4e561f4
send reshare over OCM API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle 41a1528888
implement decline share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle b7b84305a3
fix capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle 8889e14c7c
implement accept share notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle bbce8c3ea1
adjust to latest api version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle daba042d26
update capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle db428ea547
send accept share notification (WIP)
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle a3948e8a12
use new API to send a federated share if possible
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 4c8f3d6d77
add cloud federation api app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 21e64ec7f4
implement receiving of federated shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 5cfe20675d
start implementing federated sharing 2.0
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
dependabot[bot] 32f6f56ae7
Bump webpack from 4.12.2 to 4.14.0 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-30 07:21:27 +00:00
rakekniven b24b5bd297
Update SettingsControllerTest.php
adapted test for grammar change of URL
2018-06-30 08:51:58 +02:00
rakekniven 8370111cf4
Update SettingsController.php
Grammar fix. Uppercase URL
See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/146983238?q=issue%3Aopen
2018-06-30 08:49:44 +02:00
dependabot[bot] 57410e9e17
Bump webpack from 4.12.2 to 4.14.0 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-29 20:13:00 +00:00
Roeland Jago Douma 0f46ba43b3
Merge pull request #10061 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.14.0
Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibility
2018-06-29 22:00:48 +02:00
Roeland Jago Douma 9b6c0ac13c
Merge pull request #10041 from liamdennehy/10001/trashbin-defaults
Safe default behaviour when no users are specified on trashbin:cleanup
2018-06-29 21:39:16 +02:00
dependabot[bot] 52855d8a6a
Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-29 19:25:47 +00:00
Roeland Jago Douma 68f403cea2
Fix and extend tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 20:48:09 +02:00
Morris Jobke e4c3c481a2
Merge pull request #10038 from nextcloud/files-scan-home-only
Add option to only scan the home storage
2018-06-29 15:23:15 +02:00
Julius Härtl 94dcddc45e
Do not hide reset button
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:07 +02:00
Julius Härtl d6947a56c0
Adjust collaborative tags and automated tagging settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-29 14:12:06 +02:00
Morris Jobke a788f49114
Merge pull request #10046 from nextcloud/fix-getting-the-information-of-a-group-share-as-a-sharee
Fix getting the information of a group share as a sharee
2018-06-29 13:14:41 +02:00
Roeland Jago Douma f12922c7bf
Bump version of app else migrations don't run
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 10:45:47 +02:00
Georg Ehrke 4aa4e4080c
Include accept / decline links in CalDAV invitation emails
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-29 10:44:44 +02:00
Morris Jobke 326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code
Get rid of shareItem
2018-06-29 10:40:32 +02:00
Morris Jobke 3ff3141a1e
Merge pull request #9705 from nextcloud/feature/9163/whatsnew-admin-gui
display whats new info in admin settings
2018-06-29 10:36:04 +02:00
Morris Jobke 79f16f9d46
Merge pull request #10037 from nextcloud/dav-options-search
Fix search related results in OPTIONS requests
2018-06-29 09:36:12 +02:00
Arthur Schiwon 241b59f458
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Roeland Jago Douma 4e073010df
Rebuild
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 09:11:04 +02:00
Arthur Schiwon c7728c9a16
updated production js files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
Arthur Schiwon 25d9c3e529
adjust backend and gui to update and changelog server
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
John Molakvoæ (skjnldsv) 4ed8ee1c1e
Unify vue template design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
John Molakvoæ (skjnldsv) 790c897d98
various fixes, typo, center popover, updated build
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
John Molakvoæ (skjnldsv) a9e59ff732
Popover design fixes and settings update
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 427ac19e91
adjust and reuse apps.css, makes additional class and rules unnecessary
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 3fa5e46019
CSS fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon dfc56e4f03
do things with npm so make build-js-production succeeds without complaints
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 7ad0a43cc1
fix method declaration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon 1e0761c6b8
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Arthur Schiwon bafb6b3c29
display whats new info in admin settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
Daniel Calviño Sánchez 6cb2cb33ac Fix getting the information of group share as a sharee
When the receiver of a group share modifies it (for example, by moving
it to a different folder) the original share is not modified, but a
"ghost" share that keeps track of the changes made by that specific user
is used instead.

By default, the method "getShareById" in the share provider returns the
share from the point of view of the sharer, but it can be used too to
get the share from the point of view of a sharee by providing the
"recipient" parameter (and if the sharee is not found then the share is
returned from the point of view of the sharer).

The "ShareAPIController" always formats the share from the point of view
of the current user, but when getting the information of a specific
share the "recipient" parameter was not given, so it was always returned
from the point of view of the sharer, even if the current user was a
sharee. Now the "recipient" parameter is set to the current user, and
thus the information of the share is returned from the point of view of
the current user, be it the sharer or a sharee.

Note that this special behaviour of "getShareById" happens only with
group shares; with other types of shares the share is the same for the
sharer and the sharee, and thus the parameter is ignored; it was added
for them too just for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:20:19 +02:00
Morris Jobke 61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
Add user locale/region setting
2018-06-29 08:03:43 +02:00
Morris Jobke 89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
resource booking
2018-06-29 06:51:49 +02:00
Nextcloud bot ab1b848268
[tx-robot] updated from transifex 2018-06-29 00:12:08 +00:00
blizzz 28e64afb8c
Merge pull request #10034 from nextcloud/fix/noid/ldap-silence-quota-logmsgs
lower log level for quota manipulation cases
2018-06-28 23:06:23 +02:00
Liam Dennehy 68e41a3aae trashbin:cleanup exceptions for invalid options
* throw on no parameters provided
* throw on --all-users and userid provided

Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 22:31:27 +02:00
Arthur Schiwon cc51a00c93
lower log level for quota manipulation cases
and simplify the forest of ifs a little bit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-28 21:10:07 +02:00
Liam Dennehy 6bc3d3781d Default behaviour when no users are specified on trashbin:cleanup
* Add option --all-users to explicitly clean all trashbins
* Reject no users on commandline and no --all-users
* Warn when --all-users and userids are specified

Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 17:14:45 +02:00
Robin Appelman b9e685236f
Add option to only scan the home storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 16:09:25 +02:00
Robin Appelman b21bec5c73
Fix search related results in OPTIONS requests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 14:54:46 +02:00
Georg Ehrke ab43251a45
Call Backgroundjob with parameter, as interface requires
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 10:55:47 +02:00
Morris Jobke a077c129c8
Merge pull request #10031 from nextcloud/fix/9987/ldap-backupserver-connect
LDAP backup server should not be queried when auth fails
2018-06-28 08:38:52 +02:00
Nextcloud bot 1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Arthur Schiwon 7a728f2154
LDAP backup server should not be queried when auth fails
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:12:07 +02:00
Georg Ehrke 3ffeb4ae06
fix tests / mistakes made during rebase
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:04 +02:00
Roeland Jago Douma 0872f0b4b2
Merge pull request #10018 from nextcloud/rakekniven-patch-2
Update root.vue
2018-06-27 20:22:31 +02:00
Julius Härtl f3949cf1a8
Add groupware settings section
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
Robin Appelman 431710a5aa
also retry rename operation on InvalidArgumentException
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-27 15:33:51 +02:00
Morris Jobke 314ad266d5
Compile app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-27 13:47:31 +02:00
Thomas Citharel abab7eb7f0
handle config.php values
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00