summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-0532-10/+150
|
* Merge pull request #16746 from owncloud/fix-phpdocRobin McCorkell2015-06-041-1/+1
|\ | | | | Fix typo in PHPDoc
| * Fix typo in PHPDocMorris Jobke2015-06-041-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-04130-94/+172
|
* Merge pull request #15895 from owncloud/dav-getremoteetagJoas Schilling2015-06-032-3/+35
|\ | | | | Get etag from remote OC server
| * Disable update check test when testing wrappersVincent Petry2015-06-021-0/+3
| | | | | | | | | | The checkUpdate test is intended for testing real storages, not wrappers.
| * Added storage backend test for checkUpdateVincent Petry2015-06-021-0/+15
| | | | | | | | | | This helps testing whether checkUpdate properly returns false when no change exists
| * Get etag from remote OC serverVincent Petry2015-06-021-3/+17
| |
* | Merge pull request #16730 from owncloud/LukasReschke-patch-1Thomas Müller2015-06-031-2/+2
|\ \ | | | | | | Fix unit tests
| * | Fix unit testsLukas Reschke2015-06-031-2/+2
|/ / | | | | | | | | | | | | | | | | Regression caused by https://github.com/owncloud/core/pull/16721 Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/: ``` Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.' ```
* | Merge pull request #16703 from owncloud/fix-ie8-ie9Morris Jobke2015-06-031-0/+6
|\ \ | | | | | | Fix IE8 & IE9 - setup page
| * | Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| | |
| * | Revert "fix theme in IE8 and IE9"Morris Jobke2015-06-031-0/+5
| | | | | | | | | | | | This reverts commit a4c9688711977376f9d8ad7bf94a1e92d964cd7b.
* | | Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversionsMorris Jobke2015-06-032-9/+125
|\ \ \ | | | | | | | | Keep versions when deleting as recipient
| * | | Keep versions when deleting as recipientVincent Petry2015-06-022-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.
* | | | Merge pull request #16721 from owncloud/fix-grammar-enc-moduleClark Tomlinson2015-06-031-2/+2
|\ \ \ \ | | | | | | | | | | Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
| * | | | Catch NotFoundException and return no quota information which simply ↵Thomas Müller2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | reflects the current state - no file storage has been initialized for the user.
| * | | | Fixing grammar - refs ↵Thomas Müller2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746
* | | | | Merge pull request #16719 from owncloud/fix-encryption-testsThomas Müller2015-06-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use not deprecated method in tests
| * | | | | use not deprecated method in testsMorris Jobke2015-06-031-1/+1
|/ / / / /
* | | | | Merge pull request #16434 from owncloud/persist-maintenance-stateThomas Müller2015-06-033-9/+27
|\ \ \ \ \ | | | | | | | | | | | | Persist the state of the maintenance after an upgrade
| * | | | | Persist the state of the maintenance after an upgradeMorris Jobke2015-05-193-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if maintenance mode was enabled before an upgrade it will be enabled afterwards too * fixes #16429
* | | | | | Merge pull request #16687 from owncloud/issue-16113-redis-minimum-versionThomas Müller2015-06-033-8/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Check for redis to be 2.2.5+
| * | | | | Check for redis to be 2.2.5+Joas Schilling2015-06-023-8/+20
| | |/ / / | |/| | |
* | | | | Merge pull request #16714 from owncloud/fix-cors-testLukas Reschke2015-06-031-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix #16713
| * | | | | fix #16713Bernhard Posselt2015-06-031-0/+7
| | | | | |
* | | | | | Merge pull request #16708 from owncloud/enc_fix_move_to_trashMorris Jobke2015-06-032-31/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | make sure that we always use the correct owner for both source and target
| * | | | | | make sure that we always use the correct owner for both source and targetBjoern Schiessle2015-06-032-31/+63
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16710 from owncloud/move-invoke-private-to-base-classLukas Reschke2015-06-0332-108/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move the helpful invokePrivate method to the TestCase class
| * | | | | | Move the helpful method to the TestCase classJoas Schilling2015-06-0332-108/+122
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16711 from owncloud/files-invalidchar400Thomas Müller2015-06-031-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Translate invalid path exception to sabre exception for files
| * | | | | Translate invalid path exception to sabre exception for filesVincent Petry2015-06-031-0/+2
|/ / / / /
* | | | | Merge pull request #16698 from owncloud/use-proper-quotingVincent Petry2015-06-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Properly quote memcache.locking
| * | | | Properly quote memcache.lockingLukas Reschke2015-06-021-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0376-60/+398
|/ / / /
* | | | Merge pull request #16686 from owncloud/show_cloud_idLukas Reschke2015-06-024-0/+61
|\ \ \ \ | | | | | | | | | | show federated cloud id in the personal settings
| * | | | L10n for federated cloud ID and rtrim '/' on IDMorris Jobke2015-06-022-2/+2
| | | | |
| * | | | show federated cloud id in the personal settingsBjoern Schiessle2015-06-024-0/+61
| | | | |
* | | | | Merge pull request #16667 from ↵Morris Jobke2015-06-023-43/+106
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | owncloud/issue-16510-fix-encryption-with-s2s-shares Add tests for the storage wrapper and fix the wrapping
| * | | | Correctly ignore remote shares aswellJoas Schilling2015-06-021-1/+4
| | | | |
| * | | | Add unit tests for wrapStorageJoas Schilling2015-06-022-2/+46
| | | | |
| * | | | Move the storage wrapping into a testable methodJoas Schilling2015-06-022-43/+59
| | |_|/ | |/| |
* | | | Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-masterThomas Müller2015-06-021-1/+7
|\ \ \ \ | |/ / / |/| | | Fix get local file encryption master
| * | | Only return cached files if existingThomas Müller2015-05-061-1/+4
| | | |
| * | | Only use cached files in case encryption is enabled - in any other case let ↵Thomas Müller2015-05-051-1/+4
| | | | | | | | | | | | | | | | the underlying storage handle this accordingly - refs #16061 #16062 and others
* | | | Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-previewMorris Jobke2015-06-021-3/+11
|\ \ \ \ | | | | | | | | | | Get a 96x96 preview for file conflict resolution
| * | | | Escape single quotesOlivier Paroz2015-05-291-0/+2
| | | | |
| * | | | Fix for parenthesisOlivier Paroz2015-05-291-1/+1
| | | | |
| * | | | Get a 96x96 preview for file conflict resolutionOlivier Paroz2015-05-291-3/+9
| | | | |
* | | | | Merge pull request #16200 from owncloud/kill-globalfilecacheMorris Jobke2015-06-0216-946/+144
|\ \ \ \ \ | | | | | | | | | | | | Drop file caching
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 09:59:07 +0000