summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.2 RC2v8.2RC2C Montero-Luque2015-10-131-2/+2
|
* Merge pull request #19746 from owncloud/reference-v2-instead-of-v1Morris Jobke2015-10-132-27/+27
|\ | | | | Reference v2 in the provider list
| * Reference v2 in the provider listLukas Reschke2015-10-132-27/+27
|/
* Merge pull request #19739 from owncloud/do-not-leak-exception-dataThomas Müller2015-10-133-15/+64
|\ | | | | [master] Do not print exception message
| * Do not print exception messageLukas Reschke2015-10-133-15/+64
| | | | | | | | | | | | In case of an error the error message often contains sensitive data such as the full path which potentially leads to a full path disclosure. Thus the error message should not directly get displayed to the user and instead be logged.
* | Merge pull request #19635 from owncloud/fix-ldap-value-limitationThomas Müller2015-10-137-52/+59
|\ \ | | | | | | allow an attribute to return more than one value
| * | adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-091-1/+3
| | |
| * | adjust testsArthur Schiwon2015-10-092-4/+4
| | |
| * | fix primary group retrievalArthur Schiwon2015-10-091-1/+1
| | |
| * | treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-083-6/+6
| | |
| * | adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-084-13/+33
| | |
| * | allow an attribute to return more than one valueArthur Schiwon2015-10-072-29/+14
| | |
* | | Merge pull request #19735 from owncloud/extstorage-signatureThomas Müller2015-10-131-2/+3
|\ \ \ | |_|/ |/| | Fix testDeleteStorage signature to match the one from the base class
| * | Fix testDeleteStorage signature to match the one from the base classVincent Petry2015-10-131-2/+3
|/ / | | | | | | Prevents Strict warning when running autotest-external.sh
* | Merge pull request #19677 from ↵Thomas Müller2015-10-135-17/+23
|\ \ | | | | | | | | | | | | owncloud/silently-fail-app-upgrade-exceptions-master Silently fail app upgrade exceptions
| * | Always pass in ILoggerThomas Müller2015-10-095-11/+13
| | |
| * | Clean codeThomas Müller2015-10-091-2/+2
| | |
| * | Catch exceptions during app upgrade - fixes #16240Thomas Müller2015-10-091-4/+8
| | |
* | | Merge pull request #19288 from RealRancor/restruct_config_sample_masterThomas Müller2015-10-131-31/+31
|\ \ \ | | | | | | | | Restructure config.sample.php of master
| * | | Restructure config.sample.php of masterRealRancor2015-10-131-31/+31
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1326-12/+86
| | |
* | | Merge pull request #19723 from owncloud/strip-directoryThomas Müller2015-10-132-5/+49
|\ \ \ | | | | | | | | Strip directory from scriptName
| * | | Strip directory from scriptNameLukas Reschke2015-10-122-5/+49
| | | | | | | | | | | | | | | | `\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
* | | | Merge pull request #19719 from owncloud/edit-iconThomas Müller2015-10-133-0/+8
|\ \ \ \ | |/ / / |/| | | add specific edit icon
| * | | add specific edit iconJan-Christoph Borchardt2015-10-133-0/+8
|/ / /
* | | Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypesThomas Müller2015-10-122-2/+28
|\ \ \ | | | | | | | | Do not update mime types for folders with extension
| * | | Do not update mime types for folders with extensionVincent Petry2015-10-092-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | Some folders might have an extension like "test.conf". This fix prevents to overwrite the folder's mime type with another mime type while running the mimetype repair step.
* | | | Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounceThomas Müller2015-10-121-5/+6
|\ \ \ \ | | | | | | | | | | Revert "Debounce cancel upload message"
| * | | | Revert "Debounce cancel upload message"Thomas Müller2015-10-121-5/+6
| | | | |
* | | | | Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionpositionThomas Müller2015-10-123-18/+14
|\ \ \ \ \ | | | | | | | | | | | | Revert "Move trashbin specific CSS that modifies sidebar"
| * | | | | Revert "Move trashbin specific CSS that modifies sidebar"Thomas Müller2015-10-123-18/+14
| | | | | |
* | | | | | Merge pull request #19704 from owncloud/fix_17997Björn Schießle2015-10-122-0/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | | also detect files in a .part folder as part file
| * | | | | also detect files in a .part folder as part fileBjoern Schiessle2015-10-122-0/+27
|/ / / / /
* | | | | Merge pull request #19657 from owncloud/setup-transportThomas Müller2015-10-122-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Setup sendmail transport
| * | | | | Setup sendmail transportLukas Reschke2015-10-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854 and https://github.com/owncloud/core/issues/19110
* | | | | | Merge pull request #19702 from owncloud/trash-deletesectionpositionRaghu Nayyar2015-10-123-14/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Move trashbin specific CSS that modifies sidebar
| * | | | | Move trashbin specific CSS that modifies sidebarVincent Petry2015-10-123-14/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | Only when trashbin is enabled, its sidebar nav element must be fixed at the bottom.
* | | | | Merge pull request #19628 from owncloud/files-canceluploaddebounceRobin Appelman2015-10-121-6/+5
|\ \ \ \ \ | | | | | | | | | | | | Debounce cancel upload message
| * | | | | Debounce cancel upload messageVincent Petry2015-10-071-6/+5
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1212-22/+36
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1120-26/+182
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1064-188/+94
| | | | |
* | | | | Merge pull request #19585 from owncloud/enc_improve_introductionJörn Friedrich Dreyer2015-10-091-4/+4
|\ \ \ \ \ | | | | | | | | | | | | improved initial explanation/warning if the admin enabled encryptrion
| * | | | | improved explanation of server side encryptionBjoern Schiessle2015-10-061-4/+4
| | | | | |
* | | | | | Merge pull request #19670 from owncloud/objectstore_filesystem_testsJörn Friedrich Dreyer2015-10-091-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | adjust filesystem tests to objectstore
| * | | | | | adjust filesystem tests to objectstoreJörn Friedrich Dreyer2015-10-091-3/+12
| | | | | | |
* | | | | | | Merge pull request #19643 from owncloud/public-download-spinnerThomas Müller2015-10-091-1/+15
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Set download cookie on public download
| * | | | | | Set download cookie on public downloadVincent Petry2015-10-081-1/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #19654 from owncloud/db-locking-no-scan-transactionRobin Appelman2015-10-091-2/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Dont use a transaction in the scanner while using db based locking
| * | | | | Dont use a transaction in the scanner while using db based lockingRobin Appelman2015-10-081-2/+8
| |/ / / /