summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [stable9.1] Escape special characters (#25429)Aaron Wood2016-10-116-8/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Use correct method in the AbstractMapping class * Change the getNamesBySearch method so that input can be properly escaped while still supporting matches * Don't escape hardcoded wildcard
* | | Merge pull request #26341 from owncloud/ldap_command_updategroup_stable91Vincent Petry2016-10-112-0/+221
|\ \ \ | |/ / |/| | [stable9.1] New command to update group mappings
| * | New command to update group mappingsJuan Pablo Villafáñez2016-10-112-0/+221
| | |
* | | Tear down FS after user update in CardDAV sync job (#26320)Vincent Petry2016-10-101-0/+2
| |/ |/| | | | | | | Because fetching the user information will also fetch the avatar, the avatar code sets up the FS and leaves the mount points cached, we need to call tearDownFS to clear that up.
* | [stable9.1] Fix logClientIn for non-existing users (#26292) (#26307)Thomas Müller2016-10-102-0/+29
| | | | | | | | | | | | | | The check for two factor enforcement would return true for non-existing users. This fix makes it return false in order to be able to perform the regular login which will then fail and return false. This prevents throwing PasswordLoginForbidden for non-existing users.
* | Merge pull request #26309 from ↵Vincent Petry2016-10-101-1/+1
|\ \ | | | | | | | | | | | | owncloud/stable9.1-0f6a5aac7c4a770d45f9a2a36f90aa331c795aac [stable9.1] Improve user list rendering perf by not resorting after every add
| * | [stable9.1] Improve user list rendering perf by not resorting after every ↵Vincent Petry2016-10-071-1/+1
|/ / | | | | | | | | | | | | | | add (#26282) The call to UserList.add() was wrong and was passing "user.lastLogin" as the sort argument which would cause the list to be resorted over and over again for every added item after loading the next page of users.
* | Merge pull request #26277 from owncloud/stable9.1-backport26031Vincent Petry2016-10-054-19/+28
|\ \ | | | | | | [Stable9.1] Allow one more origin. Log the reason of occ controller failure
| * | Use classname with namespace to inject dependencies automatically (#26105)VicDeo2016-10-042-13/+1
| | |
| * | Allow one more origin. Log the reason of occ controller failure (#26031)VicDeo2016-10-042-6/+27
| |/ | | | | | | | | | | * Log the reason of occ controller failure * Allow requests from SERVER_ADDR
* | Merge pull request #26272 from ↵Vincent Petry2016-10-054-4/+37
|\ \ | | | | | | | | | | | | owncloud/stable9.1-11c30fce0ab0a49919f968a1efc22c4e479d5fee [stable9.1] Changed request to not add a prefix to the url (#26256)
| * | [stable9.1] Changed request to not add a prefix to the url (#26256)Sergio Bertolín2016-10-044-4/+37
| |/ | | | | | | | | | | | | | | * Changed request to not add a prefix to the url * Expecting forbidden instead of service unavailable * Handling login exceptions
* | Merge pull request #26274 from owncloud/stable9.1-integration-tests-issue-26182Vincent Petry2016-10-041-0/+13
|\ \ | |/ |/| Added sharing again an own file while belonging to a group scenario t…
| * Removed cases not belonging to this PRSergio Bertolin2016-10-041-18/+0
| |
| * Added sharing again an own file while belonging to a group scenario to stable9.1Sergio Bertolin2016-10-041-0/+31
|/
* Tear down FS between cron jobs (#26223)Vincent Petry2016-09-301-0/+2
| | | | | | | | Because some cron jobs do not always properly clean up their FS usage and others might not clean up before setting up the FS, this could cause potential side effects. To make sure we exclude side effects, we tear down the FS between cron jobs.
* [stable9.1] Merge pull request #25636 from ↵Thomas Müller2016-09-304-2/+77
| | | | | owncloud/fix-birthday-calendar-component (#26056) The birthday calendar can only hold VEVENT
* [stable9.1] Unset user PHOTO before setting new one in ↵Thomas Müller2016-09-301-0/+1
| | | | | | | OCA\DAV\CardDAV\Converter::updateCard (#26243) (#26246) Signed-off-by: Olivier Mehani <shtrom@ssji.net> #26242
* Backport #26236 to stable9.1 (#26240)RealRancor2016-09-281-1/+1
|
* Backport #26087 to stable9.1 (#26230)RealRancor2016-09-271-1/+1
|
* [stable9.1] Translate file summary connector (#26221) (#26222)Thomas Müller2016-09-271-2/+4
|
* [stable9.1] Change the minimum log level to fatal (#26213) (#26215)Thomas Müller2016-09-271-1/+1
|
* [stable9.1] In case the build on master or any release branch fails an email ↵Thomas Müller2016-09-211-0/+7
| | | | notification is sent out (#26167)
* Merge pull request #26148 from ↵Vincent Petry2016-09-202-0/+44
|\ | | | | | | | | owncloud/stable9.1-c97f24efbaec7756667368568b0c5d7b506d864f [stable9.1] Redirect to challenge page when only one 2FA provider
| * [stable9.1] Redirect to challenge page when only one 2FA provider (#26141)Vincent Petry2016-09-192-0/+44
| | | | | | | | | | If only one two factor provider exists, spare the user from having to select it and redirect directly to its challenge page.
* | [stable9.1] Fix mimetype detection inside hidden folders (#26138) (#26151)Thomas Müller2016-09-202-2/+6
| |
* | Allow uploading empty files (#26135)Vincent Petry2016-09-191-4/+0
| |
* | Final 9.1.1 in version.phpv9.1.1Vincent Petry2016-09-191-2/+2
|/
* Increased version for 9.1.1 RC3v9.1.1RC3Vincent Petry2016-09-131-2/+2
|
* Improve chunk upload AssemblyStream performance (#26062) (#26072)Vincent Petry2016-09-092-11/+94
|
* Only use realpath for real directories (#26060)Vincent Petry2016-09-081-1/+6
| | | | | | | In some cross-local-storage use cases, the Local storage is instantiated with "/" as data directory. In such cases, calling realpath() would cause PHP warnings when open_basedir is set. This fix bypasses the realpath() call when dealing with a root storage.
* Increase version for 9.1.1RC2v9.1.1RC2Vincent Petry2016-09-071-2/+2
|
* Merge pull request #26050 from owncloud/stable9.1-prefilter-inaccessible-sharesVincent Petry2016-09-072-31/+195
|\ | | | | [stable9.1] Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()
| * Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()Vincent Petry2016-09-072-31/+195
| | | | | | | | | | | | | | | | | | The DefaultShareProvider now does a DB-level check to find out whether file_source is accessible at all (deleted file) or whether it's in the trashbin of a home storage. One small corner case where the home storage id is in md5 form cannot be covered properly with this approach.
* | Merge pull request #26041 from owncloud/stable9.1-fed-share-retryVincent Petry2016-09-072-7/+23
|\ \ | | | | | | [stable9.1] Fix fed share test call to return proper result
| * | Fix fed share test call to return proper resultVincent Petry2016-09-072-7/+23
| |/ | | | | | | | | | | Fixes an issue where retrying a previously failed federated share would not properly reset the availability flag because the return value was undefined instead of "true".
* | Merge pull request #26048 from owncloud/stable9.1-cath-needs-upgrade-non-cliVincent Petry2016-09-071-0/+6
|\ \ | |/ |/| [Stable9.1] catch needs upgrade non cli
| * Pass web requests to occ controller if upgrade is neededVictor Dubiniuk2016-09-061-0/+6
| |
* | Merge pull request #26043 from ↵Vincent Petry2016-09-072-29/+22
|\ \ | |/ |/| | | | | owncloud/stable9.1-d17a7ff32a38804d9e6cfbc7dde36fe2f4b73c39 [stable9.1] Fix failing preview unit tests (#26039)
| * [stable9.1] Fix failing preview unit tests (#26039)Thomas Müller2016-09-062-29/+22
| |
* | Merge pull request #26045 from owncloud/stable9.1-fix-shareperms-increase-ownerVincent Petry2016-09-062-1/+109
|\ \ | |/ |/| [stable9.1] Allow increasing permissions for share owner
| * Allow increasing permissions for share ownerVincent Petry2016-09-062-1/+109
|/ | | | | | In some cases, the owner of the share is also recipient through a group share. The owner must still be able to increase permissions in that situation.
* forward port smbfixes (#25951)Jörn Friedrich Dreyer2016-09-062-61/+170
|
* [stable9.1] Comments field is not properly escaped (#26008) (#26009)Thomas Müller2016-09-021-1/+1
|
* Merge pull request #25987 from ↵Vincent Petry2016-08-316-6/+91
|\ | | | | | | | | owncloud/stable9.1-integration_tests_local_external_storage Stable9.1 integration tests local external storage
| * Changed enabled/disabled app in provisioning api testsSergio Bertolín2016-08-301-6/+7
| |
| * External storage was not enabled and content was not deleted before scenariosSergio Bertolín2016-08-301-0/+3
| | | | | | | | | | | | Conflicts: build/integration/features/bootstrap/BasicStructure.php build/integration/run.sh
| * Added local_storage folderSergio Bertolín2016-08-301-0/+4
| |
| * Run as current userSergio Bertolin2016-08-301-1/+2
| | | | | | | | | | Conflicts: build/integration/run.sh
| * Removed extra context added needed option and remove storage after external ↵Sergio Bertolin2016-08-303-26/+1
| | | | | | | | | | | | | | | | storage scenarios Conflicts: build/integration/features/bootstrap/BasicStructure.php build/integration/run.sh