summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Add magical regex to catch browsersLukas Reschke2016-03-242-1/+15
| * | | | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-247-3/+215
| | |_|/ | |/| |
* | | | Merge pull request #23799 from owncloud/dont-collide-with-php-internalsC. Montero Luque2016-04-061-3/+2
|\ \ \ \
| * \ \ \ Merge branch 'stable9' into dont-collide-with-php-internalsC. Montero Luque2016-04-061-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #23805 from owncloud/backport-of-#23760Thomas Müller2016-04-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [stable9] Fix conditional check in MySQL setupDaniel Hansson2016-04-051-1/+1
|/ / / /
| * / / Use static methodLukas Reschke2016-04-051-3/+2
|/ / /
* | | Merge pull request #23764 from owncloud/backport-23743-transfer-ownershipThomas Müller2016-04-042-3/+13
|\ \ \
| * | | Inject the Mount ManagerJoas Schilling2016-04-042-6/+10
| * | | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-041-0/+6
| | |/ | |/|
* | | Merge pull request #23541 from owncloud/backport-23515-menu-languageThomas Müller2016-04-041-6/+4
|\ \ \
| * | | Fix the translations of the User menuJoas Schilling2016-03-241-6/+4
* | | | [stable9] Read available l10n files also from theme folderMorris Jobke2016-04-046-19/+67
* | | | Merge pull request #23723 from owncloud/stable9-also-hide-password-for-privat...Thomas Müller2016-04-041-1/+1
|\ \ \ \
| * | | | Also replace password in updatePrivateKeyPasswordLukas Reschke2016-04-011-1/+1
* | | | | Merge pull request #23735 from owncloud/stable9-core-globalajaxerrorwhengoing...Thomas Müller2016-04-042-7/+77
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adjust core unit tests for unload/reload casesVincent Petry2016-04-012-6/+43
| * | | | Stronger fix for navigate away detectionVincent Petry2016-04-011-2/+10
| * | | | Firefox returns 303 on cross-domain redirectVincent Petry2016-04-011-1/+1
| * | | | Detect user navigating away, don't interpret as ajax errorVincent Petry2016-04-011-1/+26
| |/ / /
* / / / 9.0.1 RC2v9.0.1RC2C Montero-Luque2016-04-011-2/+2
|/ / /
* | | Merge pull request #23590 from owncloud/fix-themes-for-stable9Thomas Müller2016-04-011-1/+1
|\ \ \
| * | | [stable9] Fix for themes with .jpg backgroundsDaniel Hansson2016-03-261-1/+1
* | | | Merge pull request #23684 from owncloud/stable9-backport-23676Thomas Müller2016-04-013-1/+19
|\ \ \ \
| * | | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-04-013-1/+19
|/ / / /
* | | | Merge pull request #23709 from owncloud/stable9-make-sure-that-encrypted-vers...Thomas Müller2016-04-012-7/+26
|\ \ \ \
| * | | | Make sure that the encrypted version is setLukas Reschke2016-03-312-7/+26
* | | | | Merge pull request #23710 from owncloud/fix_encryption_versions_on_external_s...Thomas Müller2016-04-0112-130/+311
|\ \ \ \ \
| * | | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+311
| |/ / / /
* | | | | Merge pull request #23518 from owncloud/stable9-gdrive-stream-downloadThomas Müller2016-03-311-4/+5
|\ \ \ \ \
| * | | | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
* | | | | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-downloadFrank Karlitschek2016-03-312-8/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
| * | | | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-232-7/+29
| | |_|/ / | |/| | |
* | | | | Merge pull request #23689 from owncloud/revert-23629Thomas Müller2016-03-3114-137/+65
|\ \ \ \ \
| * | | | | Revert "Explicitly add the current principal to the acl in case of group shar...Thomas Müller2016-03-3114-137/+65
|/ / / / /
* | | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapperThomas Müller2016-03-311-1/+3
|\ \ \ \ \
| * | | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
* | | | | | Merge pull request #23552 from owncloud/fix-group-sharing-for-v1-caldav-and-c...Thomas Müller2016-03-3110-88/+214
|\ \ \ \ \ \
| * | | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-311-1/+2
| * | | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-319-84/+193
| * | | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-311-0/+15
| * | | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-313-4/+5
|/ / / / / /
* | | | | | Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9Thomas Müller2016-03-3114-67/+139
|\ \ \ \ \ \
| * | | | | | Fix unit testThomas Müller2016-03-301-1/+1
| * | | | | | Explicitly add the current principal to the acl in case of group sharingThomas Müller2016-03-2914-66/+138
* | | | | | | Merge pull request #23640 from owncloud/backport-23545-lock-mountpoint-on-rem...Thomas Müller2016-03-311-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Lock the mountpoint while removingJoas Schilling2016-03-301-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #23659 from owncloud/backport-23654-xcache-availablilityThomas Müller2016-03-311-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | |/ / / / | |/| | | |