aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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
| * | | | | remove file cache remainings from server containerArthur Schiwon2015-05-131-5/+7
| | | | | |
| * | | | | add repair steps to get rid of old background jobsArthur Schiwon2015-05-123-0/+120
| | | | | |
| * | | | | also free joblist and base from file cache codeArthur Schiwon2015-05-122-17/+0
| | | | | |
| * | | | | remove file cache classes and its testsArthur Schiwon2015-05-089-922/+0
| | | | | |
| * | | | | only use memcache, if availableArthur Schiwon2015-05-081-2/+17
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-02106-102/+260
| | | | | |
* | | | | | Merge pull request #16672 from owncloud/tests-xmlupdateThomas Müller2015-06-012-10/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix phpunit xml
| * | | | | | Fix phpunit xmlVincent Petry2015-06-012-10/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Rename/remove obsolete paths
* | | | | | Merge pull request #16663 from owncloud/no-sense-to-check-for-cliJoas Schilling2015-06-011-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove check for RAW_POPULATE_POST_DATA for unit tests
| * | | | | | Remove check for RAW_POPULATE_POST_DATA for unit testsLukas Reschke2015-06-011-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do have a work around meanwhile and for CLI this is not relevant at all. Can be removedWe do have a work around meanwhile and for CLI this is not relevant at all. Can be removed.
* | | | | | | Clean application identifier before processingLukas Reschke2015-06-011-0/+2
| | | | | | |
* | | | | | | Bump Dropbox library to newest upstream versionLukas Reschke2015-06-0110-187/+4720
| | | | | | |
* | | | | | | Merge pull request #16237 from owncloud/file-lockingThomas Müller2015-06-0126-30/+780
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | High level file locking
| * | | | | | Fixing undefined index 'foo'Thomas Müller2015-06-011-0/+3
| | | | | | |
| * | | | | | fix nooplockingproviderRobin Appelman2015-06-011-2/+9
| | | | | | |
| * | | | | | shared lock around hooksRobin Appelman2015-06-012-11/+46
| | | | | | |
| * | | | | | add changeLock to the storage apiRobin Appelman2015-06-016-0/+54
| | | | | | |
| * | | | | | add method to atomically change between shared and exclusive lockRobin Appelman2015-06-013-0/+82
| | | | | | |
| * | | | | | Adding information on file locking status to admin sectionThomas Müller2015-06-012-12/+33
| | | | | | |
| * | | | | | Return 423 instead of 503 for locked filesVincent Petry2015-06-011-1/+1
| | | | | | |
| * | | | | | Move locking exceptionsVincent Petry2015-06-012-4/+15
| | | | | | |
| * | | | | | Convert LockedException to FileLocked in Sabre connectorVincent Petry2015-06-012-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Sabre to be able to return the proper error code instead of 500, the LockedException is now rethrown as FileLocked exception in the Sabre connector
| * | | | | | add locking for non-chunking webdav uploadRobin Appelman2015-06-011-0/+5
| | | | | | |
| * | | | | | use arraycache for locking in unit testsRobin Appelman2015-06-011-0/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 15:32:26 +0000