summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-08-3034-2/+60
|
* [tx-robot] updated from transifexNextcloud bot2018-08-2910-0/+14
|
* [tx-robot] updated from transifexNextcloud bot2018-08-284-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2018-08-2746-26/+102
|
* [tx-robot] updated from transifexNextcloud bot2018-08-2624-0/+190
|
* [tx-robot] updated from transifexNextcloud bot2018-08-25158-156/+136
|
* Merge pull request #10837 from nextcloud/dav-search-no-negative-mtime-13Roeland Jago Douma2018-08-241-1/+1
|\ | | | | [13] disallow negative mtime in dav search
| * disallow negative mtime in dav searchRobin Appelman2018-08-241-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #10791 from nextcloud/version/noid/13.0.6RC1v13.0.6RC1Morris Jobke2018-08-241-2/+2
|\ \ | | | | | | 13.0.6 RC 1
| * | 13.0.6 RC 1Morris Jobke2018-08-231-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-08-24152-10/+512
|/ /
* | Merge pull request #10591 from nextcloud/smb-stat-retry-13Morris Jobke2018-08-231-1/+8
|\ \ | | | | | | [13] retry smb stat on timeout
| * | retry stat on timeoutRobin Appelman2018-08-081-1/+8
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #10285 from nextcloud/anonymous-options-13Morris Jobke2018-08-237-3/+223
|\ \ \ | | | | | | | | [13] Add sabre plugin to allow anonymous options requests to the dav root
| * | | adjust to older library versionRobin Appelman2018-07-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Fix lazy search backendRobin Appelman2018-07-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Fix search related results in OPTIONS requestsRobin Appelman2018-07-185-3/+84
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Add tests for handling anonymous authRobin Appelman2018-07-181-0/+71
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Add sabre plugin to allow anonymous options requests to the dav rootRobin Appelman2018-07-185-0/+68
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #10823 from ↵Morris Jobke2018-08-231-4/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport/10168/allow-utf8mb4-on-maria-10.3-or-later [stable13] MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default
| * | | | MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by defaultJoas Schilling2018-08-231-4/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10821 from nextcloud/backport/10471/improve-url-detectionblizzz2018-08-232-1/+2
|\ \ \ \ \ | | | | | | | | | | | | [stable13] Improve URL detection
| * | | | | Improve URL detectionJoas Schilling2018-08-232-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10816 from nextcloud/backport/10700+10815/stable13Morris Jobke2018-08-231-18/+2
|\ \ \ \ \ | |/ / / / |/| | | | [stable13] remove unexecutable code
| * | | | returning of $tr is expected, otherwise ending up in a JS errorArthur Schiwon2018-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | remove unexecutable codeArthur Schiwon2018-08-231-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OCA.Sharing.SharedFileInfo was never defined and that stopped execution. Interestingly, FF never showed me an error. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-23508-1618/+94
|/ / / /
* | | | Merge pull request #10783 from nextcloud/backport/10775/stable13Morris Jobke2018-08-221-1/+1
|\ \ \ \ | | | | | | | | | | [stable13] Resolve all group memberships properly
| * | | | Resolve all group memberships properlyMorris Jobke2018-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #10763 from nextcloud/backport/10687/stable13Roeland Jago Douma2018-08-224-36/+72
|\ \ \ \ \ | | | | | | | | | | | | [stable13] don't blame randome people for background email updates
| * | | | | fix unit testsArthur Schiwon2018-08-201-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> # Conflicts: # apps/user_ldap/tests/User_LDAPTest.php
| * | | | | don't force LDAP updates on userExists anymoreArthur Schiwon2018-08-201-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove some deprecated code Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | don't blame email address changersArthur Schiwon2018-08-202-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the information is being collected with admin_audit Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-2238-64/+264
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-21150-458/+514
| | | | |
* | | | | Merge pull request #10762 from ↵blizzz2018-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/10260/improved-sql-for-fetching-quota [stable13] Use the path_hash instead of the path to query the filecache
| * | | | | Use the path_hash instead of the path to query the filecacheMorris Jobke2018-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #10760 from ↵Morris Jobke2018-08-201-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/backport/10355/make-sure-error-log-always-receives-a-string [stable13] Make sure error_log() always receives a string
| * | | | | Make sure error_log() always receives a stringJoas Schilling2018-08-201-0/+3
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10552 from nextcloud/backport/10523/stable13Morris Jobke2018-08-202-3/+79
|\ \ \ \ \ | | | | | | | | | | | | [stable13] Adding test for table schedulingobjects and fixing postgres LOB
| * | | | | Adding test for table schedulingobjects and fixing postgres LOBThomas Müller2018-08-062-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit afd4ebf0404e8bcd7cba0bec2dce177e97632f8a) Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
* | | | | | Merge pull request #10698 from nextcloud/smb-log-removed-entries-13blizzz2018-08-201-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [13] log entries that are hidden during file listing
| * | | | | | log entries that are hidden during file listingRobin Appelman2018-08-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #10565 from ↵Morris Jobke2018-08-202-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/stable13-10348-fix-transfering-ownership-of-a-share-to-user-with-same-id-as-receiver [stable13] Fix transfering ownership of a share to user with same id as receiver
| * | | | | | | Fix transfering ownership of a share to user with same id as receiverDaniel Calviño Sánchez2018-08-072-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the ownership of a user share is transfered to the receiver the share is removed, as the receiver now owns the original file. However, due to a missing condition, any share with a group, link or remote with the same id as the user was removed, not only the user shares. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | Merge pull request #10735 from nextcloud/forgotten-pass-fix-linkMorris Jobke2018-08-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable13] Forgotten pass fix link
| * | | | | | | | Do not bind reset password link if an url is setJohn Molakvoæ (skjnldsv)2018-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | Merge pull request #10761 from ↵Morris Jobke2018-08-201-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/10225/fix-url-generation-dav-app [stable13] Fix call to OC.generateUrl for caldav birthday calendar on/off
| * | | | | | | | | Fix call to OC.generateUrl for caldav birthday calendar on/offDaniel Kesselberg2018-08-201-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | Merge pull request #10759 from ↵Morris Jobke2018-08-201-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/10755/fix-comments-in-config-sample [stable13] Fix comment style in config sample