summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10548 from owncloud/encryption-app-descriptionMorris Jobke2014-08-211-2/+2
|\
| * Better description to prevent people from misunderstanding the use caseBernhard Posselt2014-08-211-2/+2
* | no external files on windows for nowThomas Müller2014-08-211-2/+2
* | no external files on windows for nowThomas Müller2014-08-211-0/+2
* | Merge pull request #10458 from owncloud/fix-tar-testsLukas Reschke2014-08-212-115/+140
|\ \
| * | Fix windows tests skippingMorris Jobke2014-08-211-2/+7
| * | Add files as string to tar archivesRobin Appelman2014-08-211-6/+2
| * | reformatRobin Appelman2014-08-211-112/+136
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-21492-1103/+1236
* | Merge pull request #10562 from Volker-E/masterClark Tomlinson2014-08-202-2/+2
|\ \
| * | Removing `x-webkit-speech` attribute #10561Volker E.2014-08-201-1/+1
| * | fix HTML structure by rmv. obsolete input end tagVolker E.2014-08-201-1/+1
* | | Merge pull request #10518 from owncloud/fix_storage_const_autoloadLukas Reschke2014-08-2012-18/+29
|\ \ \ | |/ / |/| |
| * | Add doc for \OCP\Files\FileInfo space constantsMorris Jobke2014-08-191-0/+9
| * | fix typoMorris Jobke2014-08-191-1/+1
| * | move to public namespaceMorris Jobke2014-08-1912-17/+18
| * | Use tabs for indentation.Stephan Peijnik2014-08-191-3/+3
| * | Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesy...Stephan Peijnik2014-08-1910-16/+17
* | | Merge pull request #10557 from owncloud/better-hover-appsMorris Jobke2014-08-201-7/+2
|\ \ \
| * | | full opacity for the hovered/focused app as well for better contrastJan-Christoph Borchardt2014-08-201-7/+2
| | |/ | |/|
* | | Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupportedVincent Petry2014-08-201-0/+22
|\ \ \
| * | | Return whole file if range request cannot be granted due to encryptionVincent Petry2014-08-141-0/+22
* | | | Merge pull request #10546 from owncloud/add-note-about-cheersThomas Müller2014-08-202-0/+2
|\ \ \ \
| * | | | Add note about the term "Cheers" at end of mailMorris Jobke2014-08-202-0/+2
| | |/ / | |/| |
* | | | Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysourceJörn Friedrich Dreyer2014-08-202-19/+83
|\ \ \ \ | |/ / / |/| | |
| * | | use S3Client::encodeKey(), fixes #8325Jörn Friedrich Dreyer2014-08-141-2/+3
| * | | add unit test for #8325Jörn Friedrich Dreyer2014-08-141-17/+80
* | | | Update music repoMorris Jobke2014-08-201-1/+1
* | | | Merge pull request #10534 from owncloud/autotest-cleanuponinterruptMorris Jobke2014-08-201-5/+11
|\ \ \ \
| * | | | Restore autotest config on SIGINT or SIGTERMVincent Petry2014-08-191-5/+11
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-20710-7117/+8110
* | | | | Merge pull request #10525 from owncloud/remove-download-messageClark Tomlinson2014-08-191-1/+0
|\ \ \ \ \
| * | | | | remove obsolete 'Download preparing' message for zip downloads, fix #3755Jan-Christoph Borchardt2014-08-191-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10523 from owncloud/fix-shared-multiselectMorris Jobke2014-08-191-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix multiselect bar offset on shared pageJan-Christoph Borchardt2014-08-191-1/+2
|/ / / /
* | | | Merge pull request #9866 from owncloud/app-upgradeRobin Appelman2014-08-1910-57/+132
|\ \ \ \
| * | | | fix undefined variableRobin Appelman2014-08-181-1/+1
| * | | | only set core version at the endRobin Appelman2014-08-041-2/+0
| * | | | Set maintaince mode when updating an app from the app storeRobin Appelman2014-08-041-0/+3
| * | | | Also set the app version when updating from app storeRobin Appelman2014-08-042-2/+3
| * | | | Send feedback from upgrading apps to the upgrade uiRobin Appelman2014-08-041-0/+6
| * | | | Allow loading app without checking the upgradeRobin Appelman2014-08-041-4/+8
| * | | | extract upgrade parts to their own methodsRobin Appelman2014-08-041-19/+62
| * | | | handle service not available exceptions in index, remote and public.phpRobin Appelman2014-08-043-0/+15
| * | | | Throw an exception when we try to load an app that needs to be upgradedRobin Appelman2014-08-043-34/+28
| * | | | Extend OC_Util::needUpgrade to also catch app upgradesRobin Appelman2014-08-041-1/+12
* | | | | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinkingLukas Reschke2014-08-192-0/+16
|\ \ \ \ \
| * | | | | Add a copied_sample_config switchLukas Reschke2014-08-192-0/+16
* | | | | | Merge pull request #10500 from owncloud/fix_userlist_settings_ajaxMorris Jobke2014-08-191-3/+3
|\ \ \ \ \ \
| * | | | | | properly encode groups as json, not ',' separatedJörn Friedrich Dreyer2014-08-181-3/+3