mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
47,905 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

47905 Commits

Author SHA1 Message Date
dependabot-preview[bot] 13d86286b6
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /build 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 23:34:46 +00:00
Roeland Jago Douma 8a5b7f89fc
Merge pull request #16326 from nextcloud/backport/16308/stable15 
[stable15] Prevent undefined offset 0 in findByUserIdOrMail
 2019-07-10 21:44:55 +02:00
Daniel Kesselberg 46d349ce2a
Remove void for php7.0 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-10 12:47:39 +02:00
Daniel Kesselberg c876b3c77b Return first value from $users 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-10 10:22:36 +00:00
Nextcloud bot 10052eb7d2
[tx-robot] updated from transifex 2019-07-10 02:14:16 +00:00
Morris Jobke 1f45d7696d
Merge pull request #16304 from nextcloud/version/noid/15.0.10 
15.0.10
 2019-07-09 13:48:57 +02:00
Morris Jobke 1ee7c76c29
15.0.10 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-09 09:59:57 +02:00
Nextcloud bot caf46d2d25
[tx-robot] updated from transifex 2019-07-09 02:14:03 +00:00
Morris Jobke e7ee019dbf
Merge pull request #16283 from nextcloud/backport/15992/stable15 
[stable15] Properly load permissions in showActions
 2019-07-08 10:32:48 +02:00
Nextcloud bot cdd7144af1
[tx-robot] updated from transifex 2019-07-08 02:13:59 +00:00
Julius Härtl 3c4f11a910 Properly load permissions in showActions 
When setViewerMode(false) is called, the permissions should be fetched from the available dirInfo

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-07 18:21:55 +00:00
John Molakvoæ 27eacbafe6
[stable15] fix permissions for drag-n-drop uploads (#16250) 
[stable15] fix permissions for drag-n-drop uploads
 2019-07-07 20:00:25 +02:00
Nextcloud bot 758f2ef9ef
[tx-robot] updated from transifex 2019-07-07 02:14:28 +00:00
Nextcloud bot 221ea80fa5
[tx-robot] updated from transifex 2019-07-06 02:13:57 +00:00
Robin Appelman 76f5a23128 fix permissions for drag-n-drop uploads 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-07-05 10:24:20 +00:00
Nextcloud bot b4c9bd6299
[tx-robot] updated from transifex 2019-07-05 02:14:23 +00:00
Roeland Jago Douma 3d34955c29
Merge pull request #16190 from nextcloud/backport/16183/stable15 
[stable15] Do not fail hard on new user mail error
 2019-07-04 12:22:50 +02:00
Roeland Jago Douma 90a5734242
Merge pull request #16192 from nextcloud/backport/16024/stable15 
[stable15] Forward OCSException to initiator
 2019-07-04 12:22:23 +02:00
Roeland Jago Douma 5ba848a3ed
Merge pull request #16219 from nextcloud/version/noid/15.0.9 
15.0.9
 2019-07-04 08:47:39 +02:00
Nextcloud bot 5b1e5f26d5
[tx-robot] updated from transifex 2019-07-04 02:14:02 +00:00
Morris Jobke 8681acc5e6
15.0.9 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-03 23:29:30 +02:00
Morris Jobke bbd4007753
Merge pull request #16215 from nextcloud/backport/16186/stable15 
[stable15] Better check reshare permissions part2
 2019-07-03 23:29:09 +02:00
Roeland Jago Douma 0237578aa0
Merge pull request #16212 from nextcloud/backport/notfications/stable15 
[stable15] Fix notification casting
 2019-07-03 21:48:46 +02:00
Joas Schilling f3ad4636fc
Remove duplicate tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:31:47 +02:00
Joas Schilling 132902337e
Unify the permission checking in one place only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:31:40 +02:00
Joas Schilling 029ecb7966
Better check reshare permissions when creating a share 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:29:31 +02:00
Roeland Jago Douma 32c072853f
Fix notification casting 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-03 20:32:45 +02:00
Morris Jobke e5412ea49e
Merge pull request #16202 from nextcloud/backport/16199/stable15 
[stable15] RefreshWebcalJob: replace ugly Regex with standard php utils
 2019-07-03 09:59:48 +02:00
Nextcloud bot 9858b42cd0
[tx-robot] updated from transifex 2019-07-03 02:13:57 +00:00
Georg Ehrke 9e6c3c0773 RefreshWebcalJob: replace ugly Regex with standard php utils 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-07-02 21:03:58 +00:00
Daniel Kesselberg f66baa17d1 Forward OCSException to initiator 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-07-02 10:34:53 +00:00
John Molakvoæ (skjnldsv) d546f4fafc Do not fail hard on new user mail error 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-07-02 09:55:22 +00:00
Nextcloud bot d851e4daa1
[tx-robot] updated from transifex 2019-07-02 02:13:55 +00:00
Nextcloud bot d57a283464
[tx-robot] updated from transifex 2019-07-01 02:13:47 +00:00
Nextcloud bot 2da47e308c
[tx-robot] updated from transifex 2019-06-30 02:14:21 +00:00
Roeland Jago Douma 4012def9e0
Merge pull request #16063 from nextcloud/version/15.0.9/RC1 
15.0.9 RC1
 2019-06-29 07:19:43 +02:00
Nextcloud bot a525255c23
[tx-robot] updated from transifex 2019-06-29 02:13:45 +00:00
Roeland Jago Douma 0938255320
15.0.9 RC1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-28 15:45:46 +02:00
Roeland Jago Douma 53844c8916
Merge pull request #16142 from nextcloud/backport/16097/stable15 
[stable15] Better check reshare permissions
 2019-06-28 15:39:30 +02:00
Roeland Jago Douma 7dcd2a808c
Fix sharing tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-28 10:00:10 +02:00
Daniel Calviño Sánchez 9f6b9b44df
Add integration test for increasing sub reshare permissions 
The tests check an user share and a link share; there is a slight
difference in style between them as each one is based on the test above
it, which tests increasing reshare permissions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-28 09:49:26 +02:00
Daniel Calviño Sánchez d3301befa0
Do not create folders with admin user 
The admin user is not deleted after each integration test is run, so
folders created by the admin user in one test are still there when the
next tests run; tests should be independent one from each other, so a
regular user that is created and deleted for each test should be used
instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-28 09:49:11 +02:00
Joas Schilling 38fe009444
Correctly check share permissions when updating a re-sub-share 
Before this change the node you shared was checked for permissions.
This works when you reshare the folder that was shared with you.
However when you reshared a subfolder (e.g. as public link),
you could afterwards update the permissions and grant
create+update permissions although the share you receive was read-only.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-28 09:48:59 +02:00
Roeland Jago Douma fd64f47eee
Merge pull request #16134 from nextcloud/backport/16121/stable15 
[stable15] Don't allow to disable encryption via the API
 2019-06-28 09:45:27 +02:00
Nextcloud bot c272bee833
[tx-robot] updated from transifex 2019-06-28 02:14:00 +00:00
Joas Schilling 0be423ae67 Don't allow to disable encryption via the API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-27 20:20:14 +00:00
Roeland Jago Douma 1697f3472e
Merge pull request #16126 from nextcloud/backport/16114/stable15 
[stable15] Fix download link included in public share page with hidden download
 2019-06-27 22:13:54 +02:00
Roeland Jago Douma 843fcef3fd
Merge pull request #16129 from nextcloud/backport/16107/stable15 
[stable15] verify that paths are valid for recursive local move
 2019-06-27 22:12:33 +02:00
Robin Appelman cdc97ec9c3 verify that paths are valid for recursive local move 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-06-27 14:39:32 +00:00
Daniel Calviño Sánchez 8133ca056c Fix download link included in public share page with hidden download 
The preview element in the public share page was always wrapped with a
link to download the file; now that link is included only if the "Hide
download" option of the share is not enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-27 14:30:28 +00:00