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

42803 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez 981b757099 Remove duplicated code 
"disableDropState" was set as the event handler in 8d4e5747f3, but
the duplicated code was accidentally added back in 786e858d23.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-12 15:25:50 +02:00
Nextcloud bot 59a27ceb13
[tx-robot] updated from transifex 2018-06-12 00:13:07 +00:00
Morris Jobke 5c97dc3de3
Merge pull request #9821 from nextcloud/version/noid/13.0.4 
13.0.4
 2018-06-11 10:21:04 +02:00
Morris Jobke b8ab0a031d
13.0.4 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-11 09:50:54 +02:00
Roeland Jago Douma dfd7ea3c45
Merge pull request #9820 from nextcloud/backport/9798/stable13 
[stable13] enable caldav for webdav subtree public-calendars
 2018-06-11 09:49:50 +02:00
John Molakvoæ bf7620d868
Merge pull request #9803 from nextcloud/backport/9802/stable13 
[stable13] Make the token expiration also work for autocasting 0
 2018-06-11 09:16:57 +02:00
Georg Ehrke fa0c51d1dd
enable caldav for webdav subtree public-calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-11 09:15:26 +02:00
Nextcloud bot ebdd9a0408
[tx-robot] updated from transifex 2018-06-11 00:12:58 +00:00
Nextcloud bot c56da1aaab
[tx-robot] updated from transifex 2018-06-10 00:13:21 +00:00
Nextcloud bot 5cd6d9c4a3
[tx-robot] updated from transifex 2018-06-09 00:13:26 +00:00
Roeland Jago Douma 88c7c6abe3
Make the token expiration also work for autocasting 0 
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-08 16:26:30 +02:00
Nextcloud bot c55e842478
[tx-robot] updated from transifex 2018-06-08 00:13:15 +00:00
Morris Jobke 98e9bc33e0
Merge pull request #9788 from nextcloud/notify-credentials-env-13 
[13] allow setting notify credentials in environment
 2018-06-07 16:14:03 +02:00
Robin Appelman 642bdb5bb5
allow setting notify credentials in environment 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-07 15:47:36 +02:00
Morris Jobke 8a0093d9ca
Merge pull request #9778 from nextcloud/version/noid/13.0.3 
13.0.3
 2018-06-07 11:43:51 +02:00
Morris Jobke 299c47a565
13.0.3 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-07 11:23:48 +02:00
Nextcloud bot a19310e2cf
[tx-robot] updated from transifex 2018-06-07 00:13:06 +00:00
Nextcloud bot 9009d0cae8
[tx-robot] updated from transifex 2018-06-06 00:12:58 +00:00
Morris Jobke b5b17b0ed0
Merge pull request #9731 from nextcloud/version/noid/13.0.3RC2 
13.0.3 RC 2
 2018-06-04 17:37:19 +02:00
Morris Jobke 80ae131e3b
13.0.3 RC 2 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-04 16:47:54 +02:00
Morris Jobke e656c8e98b
Merge pull request #9732 from nextcloud/stable13-fix-contacts-menu-local-null-check 
[stable13] Fix local users check in contacts menu
 2018-06-04 16:41:28 +02:00
Christoph Wurst e5fb98d9fc
Fix syntax for php5.6 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-04 15:12:57 +02:00
Christoph Wurst 2b0ae6df9f
Fix local users check in contacts menu 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-04 15:05:40 +02:00
Morris Jobke 778c411e6c
Merge pull request #9727 from nextcloud/nav-fix 
[stable13] Fix header nav
 2018-06-04 14:22:16 +02:00
John Molakvoæ (skjnldsv) 0159d4419d
[stable13] Fix header nav 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-04 11:38:45 +02:00
Nextcloud bot 4eea45d981
[tx-robot] updated from transifex 2018-06-04 00:12:47 +00:00
Nextcloud bot 6d3cef1493
[tx-robot] updated from transifex 2018-06-03 00:13:09 +00:00
Nextcloud bot 9dd9da60cc
[tx-robot] updated from transifex 2018-06-02 00:12:51 +00:00
Morris Jobke c04ba4b7af
Merge pull request #9700 from nextcloud/version/noid/13.0.3RC1 
13.0.3 RC 1
 2018-06-01 15:08:57 +02:00
Morris Jobke 337838a49d
13.0.3 RC 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-01 14:41:37 +02:00
Morris Jobke 52b3582250
Merge pull request #9712 from nextcloud/backport/9711/stable13 
[stable13] Fix the unit tests
 2018-06-01 14:41:14 +02:00
Roeland Jago Douma 718bfb8c3f
Fix the master unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-01 14:16:38 +02:00
Morris Jobke 271bbaa809
Merge pull request #9610 from nextcloud/bugfix-stable13/3830/invitations_for_shared_calendars 
[stable13] send invitations for shared calendars
 2018-06-01 12:37:07 +02:00
Morris Jobke cf4ff7716e
Merge pull request #9694 from nextcloud/backport/9692/stable13 
[stable13] Make sure the log doesn't try to read from PUT if it can't
 2018-06-01 12:21:26 +02:00
Morris Jobke 5c92da2269
Merge pull request #9707 from nextcloud/bugfix-stable13/noid/override_freebusy_sharing_rules 
[stable13] allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities
 2018-06-01 12:01:43 +02:00
Nextcloud bot 3595aa68b9
[tx-robot] updated from transifex 2018-06-01 00:12:48 +00:00
Roeland Jago Douma f7372bea86
Merge pull request #9655 from nextcloud/backport/9268/stable13 
[stable13] Do not load calendar/addressbook plugins if not needed
 2018-05-31 19:53:07 +02:00
Georg Ehrke 08ad45e40b
allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-05-31 18:55:55 +02:00
Morris Jobke d62f5c10d3
Remove not needed change 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-31 17:20:33 +02:00
Morris Jobke fa41a4cc21
Remove type hints for PHP 5.6 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-31 17:16:47 +02:00
Nextcloud bot cc6317f2af
[tx-robot] updated from transifex 2018-05-31 00:13:02 +00:00
Roeland Jago Douma 188a41a2be
Make sure the log doesn't try to read from PUT if it can't 
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.

If we don't then we either are the first to read it, thus causing the
real read of the data to fail.

Or we are later and then it throws an exception (also failing the
request).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 20:16:18 +02:00
Roeland Jago Douma 4fae9bedc9
Move repairstep to a custom command 
People that have issues can run it manually

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:52 +02:00
Roeland Jago Douma 29f1ea2fbe
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:51 +02:00
Roeland Jago Douma 1ea356cd6a
Adding repair step which cleans shares of invalid principals 
edacf22fbc

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:51 +02:00
Roeland Jago Douma 0f88f3f00e
CalDAV and CardDAV plugins need to be registered for the principals collection as well 
9f2e6431b8

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:51 +02:00
Roeland Jago Douma 3a133b151f
When sharing calendars and addressbooks the principal has to be verified to be valid 
d3fb8fcdd3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:51 +02:00
Roeland Jago Douma ed0069b8e6
Do not load calendar/addressbook plugins if not needed 
Fixes #6711
Based on f0fb21cf35

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 13:27:51 +02:00
Morris Jobke 4c1f88efb1
Merge pull request #9654 from nextcloud/backport/9360/stable13 
[stable13] Fix "Invalid argument supplied for foreach()"
 2018-05-30 11:50:35 +02:00
Morris Jobke 3acfcc433a
Merge pull request #9668 from nextcloud/backport/9666/stable13 
[stable13] Make sure the file is readable before attempting to create a preview
 2018-05-30 11:34:29 +02:00