summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #20831 from owncloud/catch-missing-route-81Thomas Müller2015-11-304-9/+30
|\ \ \ | |_|/ |/| | [8.1] Dont die when we're missing a route
| * | Dont die when we're missing a routeRobin Appelman2015-11-304-9/+30
|/ /
* | Merge pull request #20764 from owncloud/scan-eventsource-no-paths-81Vincent Petry2015-11-261-8/+0
|\ \ | | | | | | [8.1] Dont output paths in scan.php
| * | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
| |/
* | Merge pull request #20698 from owncloud/stable8.1-backport-19530Morris Jobke2015-11-252-1/+36
|\ \ | | | | | | [stable8.1] Make sure the share we found is for the same item
| * | Add a unit test for "share a file inside a folder that is already shared"Joas Schilling2015-11-241-0/+33
| | |
| * | Make sure all variables are definedJoas Schilling2015-11-241-0/+2
| | |
| * | Make sure the share we found is for the same itemJoas Schilling2015-11-241-1/+1
|/ /
* | Merge pull request #20678 from owncloud/backport-joblist-fix-8.1Morris Jobke2015-11-231-11/+23
|\ \ | | | | | | [8.1] Make the JobList test more robust by sorting the result of getAll bef…
| * | Make the JobList test more robust by sorting the result of getAll before ↵Joas Schilling2015-11-231-11/+23
|/ / | | | | | | comparison
* | Merge pull request #20637 from owncloud/cache-escape-like-81Morris Jobke2015-11-204-1/+52
|\ \ | |/ |/| [8.1] Escape like parameter in cache operations
| * escape like parameter in cache moveRobin Appelman2015-11-201-1/+2
| |
| * Add test for special character during moveRobin Appelman2015-11-201-0/+48
| |
| * define escape character for like statements on oracleRobin Appelman2015-11-201-0/+1
| |
| * define escape character for like statements on sqliteRobin Appelman2015-11-201-0/+1
|/
* Merge pull request #20307 from ↵Morris Jobke2015-11-101-9/+9
|\ | | | | | | | | owncloud/stable8.1-backport-use-actual-mimetype-detection-instad-of-oath-1 [stable8.1] Use actual mimetype detection instead of extension
| * Use actual mimetype detection instead of extensionLukas Reschke2015-11-101-9/+9
| | | | | | | | We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
* | Merge pull request #20395 from ↵Morris Jobke2015-11-091-0/+1
|\ \ | | | | | | | | | | | | owncloud/stable8.1-extstorage-gdrive-forceapproval [stable8.1] Force approval in GDrive oauth to get refresh_token
| * | Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues.
* | | Merge pull request #20367 from owncloud/stable8.1-backport-20346Morris Jobke2015-11-091-0/+8
|\ \ \ | | | | | | | | [stable8.1] Show the language code in personal settings for unknown languages
| * | | Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
| |/ / | | | | | | | | | | | | | | | | | | Steps to reproduce: * having an unknown language set in oc_preferences * browse the personal settings * only get listed the first letter of this language in the language chooser
* | | Merge pull request #20362 from owncloud/backport-20271-stable8.1Morris Jobke2015-11-062-20/+149
|\ \ \ | |/ / |/| | [Backport] [stable8.1] attempt to connect to backup server again
| * | integration testsArthur Schiwon2015-11-061-0/+118
| | |
| * | LDAP: attempt to connect to backup server again, if main server is not ↵Arthur Schiwon2015-11-061-20/+31
|/ / | | | | | | available. Fixes #18701
* | Merge pull request #20246 from owncloud/backport-20192-stable8.1Vincent Petry2015-11-052-0/+12
|\ \ | | | | | | [backport] [stable8.1] if a user that is flag as deleted shows up again, remove that flag. F…
| * | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-11-022-0/+12
| | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/access.php
* | | Merge pull request #20286 from ↵Vincent Petry2015-11-052-27/+141
|\ \ \ | |_|/ |/| | | | | | | | owncloud/stable8.1-share-preventmovemountpointintosharedfolder [stable8.1] Prevent moving mount point into already shared folder (outgoing)
| * | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-11-042-27/+141
| | | | | | | | | | | | | | | | | | | | | | | | It is already not allowed to share a folder containing mount points / incoming shares. This fixes an issue that made it possible to bypass the check by moving the incoming share mount point into an existing outgoing share folder.
* | | Merge pull request #20298 from owncloud/backport-20155-8.1Morris Jobke2015-11-041-3/+7
|\ \ \ | |/ / |/| | [backport] [stable8.1] add port to host only, if an URL is used instead of a plain hostname
| * | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
|/ /
* | Merge pull request #20163 from owncloud/backport-19489Morris Jobke2015-11-033-1/+106
|\ \ | |/ |/| [stable8.1] fix possible infinite loop when reading groups in the wizard
| * fix possible infinite loop when reading groups in the wizardArthur Schiwon2015-10-293-1/+106
| |
* | Merge pull request #19773 from owncloud/stable8.1-proppatch-lastmodifiedMorris Jobke2015-11-022-6/+6
|\ \ | | | | | | [stable8.1] Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
| * | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"Vincent Petry2015-10-142-6/+6
| | | | | | | | | | | | | | | | | | | | | Fix regression that makes PROPPATCH of mtime work like it did in OC <= 8.0. The PROPPATCH must be done on the "lastmodified" property. The "getlastmodified" now return 403 again.
* | | Merge pull request #20137 from owncloud/LukasReschke-patch-2Morris Jobke2015-11-021-118/+82
|\ \ \ | | | | | | | | [stable8.1] Update certificate bundle
| * | | [stable8.1] Update certificate bundleLukas Reschke2015-10-291-118/+82
| | |/ | |/| | | | Backport of https://github.com/owncloud/core/pull/20126
* / | 8.1.4v8.1.4C Montero-Luque2015-10-301-2/+2
|/ /
* | 8.1.4 RC2v8.1.4RC2C Montero-Luque2015-10-281-2/+2
| |
* | Merge pull request #19512 from owncloud/backport-19419-stable8.1Thomas Müller2015-10-282-1/+36
|\ \ | | | | | | [backport] [stable8.1] memberOf resembles a DN as well and is actively used
| * | fixing typoThomas Müller2015-10-281-2/+1
| | |
| * | memberOf resembles a DN as well and is actively usedArthur Schiwon2015-10-282-1/+37
|/ / | | | | | | | | Conflicts: apps/user_ldap/tests/access.php
* | Merge pull request #19972 from owncloud/stable8.1-backport-19635Morris Jobke2015-10-2711-149/+644
|\ \ | | | | | | [stable8.1] allow an attribute to return more than one value
| * | Adjust unit testsLukas Reschke2015-10-261-8/+3
| | |
| * | Fix styleLukas Reschke2015-10-261-1/+1
| | |
| * | Revert "adjust to nested group fixFrédéric Fortier2015-10-261-6/+1
| | | | | | | | | | | | This reverts commit 845485cfe, which fixes #19816 regression.
| * | adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-221-1/+3
| | |
| * | adjust testsArthur Schiwon2015-10-222-4/+4
| | |
| * | fix primary group retrievalArthur Schiwon2015-10-221-1/+1
| | |
| * | treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-223-5/+5
| | |
| * | adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-224-13/+33
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 08:36:28 +0000