summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.0.11v8.0.11C Montero-Luque2016-03-081-2/+2
* 8.0.11 RC2v8.0.11RC2C Montero-Luque2016-03-041-2/+2
* Merge pull request #22864 from owncloud/stable8-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\
| * Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
|/
* 8.0.11 RC1v8.0.11RC1C Montero-Luque2016-03-012-3/+3
* Merge pull request #22764 from owncloud/stable8-backport-phpmailerC. Montero Luque2016-03-011-0/+0
|\
| * [stable8] Backport PHPMailer validationLukas Reschke2016-03-011-0/+0
|/
* Merge pull request #21634 from owncloud/backport-17924-stable8Vincent Petry2016-03-013-18/+12
|\
| * always use an LDAP URL when connecting to LDAPArthur Schiwon2016-01-293-18/+12
* | Merge pull request #22174 from owncloud/stable8-backport-22143Morris Jobke2016-02-061-1/+1
|\ \ | |/ |/|
| * When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-1/+1
|/
* Merge pull request #21695 from owncloud/stable8-users-scrolltopThomas Müller2016-01-151-1/+8
|\
| * Keep scroll position in users page when sortingVincent Petry2016-01-131-1/+8
|/
* Merge pull request #21464 from owncloud/stable8-fix-scanner-regressionThomas Müller2016-01-081-1/+1
|\
| * Fix regression in ajax/scan.phpMorris Jobke2016-01-051-1/+1
|/
* Merge pull request #21297 from owncloud/stable8-prevent0bytedownloadsMorris Jobke2016-01-052-2/+23
|\
| * prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-12-182-2/+23
* | 8.0.10v8.0.10C Montero-Luque2015-12-211-2/+2
* | 8.0.10 RC2C Montero-Luque2015-12-181-2/+2
|/
* 8.0.10 RC1v8.0.10RC1C Montero-Luque2015-12-152-3/+3
* Merge pull request #21214 from owncloud/backport-21133-stable8Vincent Petry2015-12-155-10/+223
|\
| * adjust tests for 8.0Arthur Schiwon2015-12-151-0/+4
| * Backport of #21133 to stable8Arthur Schiwon2015-12-154-10/+212
| * backport necessary OfflinerUser::unmark()Arthur Schiwon2015-12-151-0/+7
|/
* Merge pull request #21208 from owncloud/stable8-backport-16961Vincent Petry2015-12-153-2/+34
|\
| * Only throw exception if on new LDAP setupsMorris Jobke2015-12-153-3/+32
| * Hardening home folder retrieval in user_ldapMorris Jobke2015-12-151-1/+4
* | Merge pull request #21202 from owncloud/fix_20296_8.0Björn Schießle2015-12-1510-8/+244
|\ \ | |/ |/|
| * manually backport some helper methodsBjörn Schießle2015-12-152-0/+146
| * Fixed JS unit tests for fed owner display nameVincent Petry2015-12-151-0/+4
| * show display name but internally use the user nameBjörn Schießle2015-12-156-6/+11
| * don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-154-2/+83
|/
* Merge pull request #21150 from owncloud/backport-20978-stable8Morris Jobke2015-12-141-3/+5
|\
| * reset mailadress/displayname on blurmichag862015-12-111-3/+5
* | Merge pull request #21192 from owncloud/preview-non-existing-8Lukas Reschke2015-12-141-7/+11
|\ \
| * | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
|/ /
* / Use XMLWriter to generate responseLukas Reschke2015-12-141-17/+26
|/
* Merge pull request #20363 from owncloud/backport-20271-stable8Vincent Petry2015-12-041-20/+31
|\
| * LDAP: attempt to connect to backup server again, if main server is not availa...Arthur Schiwon2015-11-061-20/+31
* | Merge pull request #20844 from owncloud/files-scan-user-path-80Thomas Müller2015-11-301-4/+5
|\ \
| * | Lock scanner to the given userRobin Appelman2015-11-301-4/+5
|/ /
* | Merge pull request #20808 from owncloud/backport-use-new-updater-url-stable8Vincent Petry2015-11-301-6/+6
|\ \
| * | [stable8] Use new updater URLLukas Reschke2015-11-281-6/+6
|/ /
* | Merge pull request #20763 from owncloud/scan-eventsource-no-paths-8Vincent Petry2015-11-261-8/+0
|\ \
| * | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
|/ /
* | Merge pull request #19659 from owncloud/stable8-backport-19546Vincent Petry2015-11-252-1/+43
|\ \
| * | fix internal path when searching in storage rootRobin Appelman2015-11-121-2/+5
| * | Add unit test for searching in storage rootRobin Appelman2015-11-121-0/+39
| * | The minimum size for internalRootLength is 1Olivier Paroz2015-11-121-1/+1
* | | Merge pull request #20638 from owncloud/cache-escape-like-8Morris Jobke2015-11-204-1/+52
|\ \ \ | |/ / |/| |