summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-04130-94/+172
* Merge pull request #15895 from owncloud/dav-getremoteetagJoas Schilling2015-06-032-3/+35
|\
| * Disable update check test when testing wrappersVincent Petry2015-06-021-0/+3
| * Added storage backend test for checkUpdateVincent Petry2015-06-021-0/+15
| * 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 testsLukas Reschke2015-06-031-2/+2
|/ /
* | Merge pull request #16703 from owncloud/fix-ie8-ie9Morris Jobke2015-06-031-0/+6
|\ \
| * | 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
* | | Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversionsMorris Jobke2015-06-032-9/+125
|\ \ \
| * | | Keep versions when deleting as recipientVincent Petry2015-06-022-9/+125
* | | | Merge pull request #16721 from owncloud/fix-grammar-enc-moduleClark Tomlinson2015-06-031-2/+2
|\ \ \ \
| * | | | Catch NotFoundException and return no quota information which simply reflects...Thomas Müller2015-06-031-1/+1
| * | | | Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate...Thomas Müller2015-06-031-1/+1
* | | | | Merge pull request #16719 from owncloud/fix-encryption-testsThomas Müller2015-06-031-1/+1
|\ \ \ \ \
| * | | | | 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 upgradeMorris Jobke2015-05-193-9/+27
* | | | | | 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+Joas Schilling2015-06-023-8/+20
| | |/ / / | |/| | |
* | | | | Merge pull request #16714 from owncloud/fix-cors-testLukas Reschke2015-06-031-0/+7
|\ \ \ \ \
| * | | | | 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 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 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 filesVincent Petry2015-06-031-0/+2
|/ / / / /
* | | | | Merge pull request #16698 from owncloud/use-proper-quotingVincent Petry2015-06-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | 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 owncloud/issue-16510-fix-encryption-with-s2s-s...Morris Jobke2015-06-023-43/+106
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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 t...Thomas Müller2015-05-051-1/+4
* | | | Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-previewMorris Jobke2015-06-021-3/+11
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 05:56:50 +0000