upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-21 01:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
42576 commits 956 branches 1208 tags 8.5 GiB
Commit graph

42576 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Morris Jobke
db59474868
Merge pull request #9662 from nextcloud/backport/9640/stable13 
[stable13] check user state when fetching to avoid dealing with offline objects
 2018-05-30 09:19:24 +02:00
Morris Jobke
d95757b7d0
Merge pull request #9657 from nextcloud/backport/9256/stable13 
[stable13] improve error reporting and move format parameter to the options
 2018-05-30 09:18:36 +02:00
Morris Jobke
fd9c134d66
Merge pull request #9672 from nextcloud/drone-mysqlmb4-fix-stable13 
[stable13] Fix drone mysqlmb4 tests
 2018-05-30 09:17:41 +02:00
John Molakvoæ (skjnldsv)
9a0126cadd
Fix drone mysqlmb4 tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-30 08:57:51 +02:00
Nextcloud bot
b889259b1e
[tx-robot] updated from transifex 2018-05-30 00:12:31 +00:00
Roeland Jago Douma
e55effc5ef
Make sure the file is readable before attempting to create a preview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-29 22:03:43 +02:00
Morris Jobke
b71c90bac1
Merge pull request #9650 from nextcloud/backport/8842/stable13 
[stable13] fix(AmazonS3):  fix loop $result['Contents'] error
 2018-05-29 20:56:03 +02:00
Arthur Schiwon
d33ba08b05
check user state when fetching to avoid dealing with offline objects 
fixes #9502

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-29 20:54:48 +02:00
Roeland Jago Douma
d6ab2a4ddb
Merge pull request #9661 from nextcloud/backport/9288/stable13 
[stable13] LDAP password renewal fixes
 2018-05-29 20:16:05 +02:00
Morris Jobke
a52f0150af
Merge pull request #9659 from nextcloud/backport/9653/stable13 
[stable13] The OAuth endpoint needs to support Basic Auth
 2018-05-29 17:12:00 +02:00
Morris Jobke
5c9f2dd99f
Merge pull request #9651 from nextcloud/backport/9271/stable13 
[stable13] Fix undefined variables
 2018-05-29 17:08:40 +02:00
Morris Jobke
b3e9e36b14
Merge pull request #9656 from nextcloud/backport/9490/stable13 
[stable13] Make LargeFileHelper.php faster by avoiding execs as much as possible
 2018-05-29 17:08:12 +02:00
Morris Jobke
de539c6e27
Merge pull request #9649 from nextcloud/sabre-head-dont-open-file-13 
[13] dont open the file on dav HEAD request
 2018-05-29 17:02:47 +02:00
Morris Jobke
9f793f91c9
Merge pull request #9608 from nextcloud/smb-exceptions-on-listing 
[13] Handle exception while itterating trough smb file listing
 2018-05-29 17:01:51 +02:00
Roger Szabo
49c1a7f2ae
Remove unneeded semicolon and parentheses 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 16:40:50 +02:00
Roger Szabo
b3b774dfc5
css indent alignment 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 16:40:46 +02:00
Roger Szabo
733eae5b91
adjust css to nc13 core changes 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 16:40:43 +02:00
Roger Szabo
4ba9556bc2
remove reset password link 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 16:40:39 +02:00
Morris Jobke
c61e9577e6
Merge pull request #9652 from nextcloud/search-category-stable13 
[stable13] Add search category icon
 2018-05-29 16:39:43 +02:00
Roeland Jago Douma
d48333910e
The OAuth endpoint needs to support Basic Auth 
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-29 15:57:04 +02:00
Robin Appelman
a8b674fd8c
dont open the file on dav HEAD request 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-29 15:42:29 +02:00
Bjoern Schiessle
58be1f1b2f
improve error reporting and move format parameter to the options 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-05-29 15:34:32 +02:00
marco44
184a0b97fc
Make LargeFileHelper.php faster by avoiding execs as much as possible 
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
 2018-05-29 15:31:55 +02:00
Roger Szabo
0b25317269
adjust unit tests for \"Invalid argument supplied for foreach()\" fix 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 15:21:23 +02:00
Roger Szabo
27fca0eebc
Fix "Invalid argument supplied for foreach()" 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-05-29 15:21:19 +02:00
John Molakvoæ (skjnldsv)
221f3a4819
Add search category icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-29 15:13:58 +02:00
Morris Jobke
57489f1013
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-29 15:13:57 +02:00