aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-0958-249/+234
* Updated info.xml withMTRichards2014-10-081-16/+2
* Updated info.xml app descriptionMTRichards2014-10-081-1/+5
* Forgot a '.'MTRichards2014-10-081-1/+1
* Updated info.xml app descriptionMTRichards2014-10-081-11/+2
* Updated info.xml app descriptionMTRichards2014-10-081-1/+5
* Updated info.xml app descriptionMTRichards2014-10-081-3/+5
* Updated info.xml with descriptionMTRichards2014-10-081-3/+3
* Merge pull request #11455 from owncloud/config-sample-cleanupMorris Jobke2014-10-081-237/+599
|\
| * Fixes in config.sample.phpMorris Jobke2014-10-081-15/+31
| * re-arrange the config options and sort them in a semantical wayMorris Jobke2014-10-081-172/+278
| * unify style of config.sample.phpMorris Jobke2014-10-081-215/+455
* | Merge pull request #11471 from brumsoel/masterMorris Jobke2014-10-081-1/+1
|\ \
| * | Fix file size comparator return valuebrumsoel2014-10-081-1/+1
* | | extract batchDelete(), better commentsJörn Friedrich Dreyer2014-10-081-31/+31
* | | files_extern: remove empty Body and ContentLength in Amazon S3 mountAndré Gaul2014-10-081-3/+1
* | | strict comparisonJörn Friedrich Dreyer2014-10-081-2/+2
* | | make some storage tests explain what went wrongJörn Friedrich Dreyer2014-10-081-6/+6
* | | fix amazon s3 issuesJörn Friedrich Dreyer2014-10-083-110/+125
* | | log exceptions when listing filesJörn Friedrich Dreyer2014-10-081-0/+3
* | | Merge pull request #11453 from owncloud/enc_visual_improvementsMorris Jobke2014-10-088-110/+125
|\ \ \
| * | | improved visual feedback if user enabled recovery keyBjoern Schiessle2014-10-073-19/+15
| * | | improved visual feedback if recovery key password gets changedBjoern Schiessle2014-10-073-9/+32
| * | | improved visual feedback if recovery key gets enabled/disabledBjoern Schiessle2014-10-073-50/+41
| * | | make sure that the notification gets shown again after a second tryBjoern Schiessle2014-10-071-32/+37
* | | | Merge pull request #11460 from owncloud/fix-10880Morris Jobke2014-10-081-1/+1
|\ \ \ \
| * | | | fix for issue #10880michag862014-10-071-1/+1
| | |/ / | |/| |
* | | | Merge pull request #11477 from owncloud/improve-heading-whitespaceMorris Jobke2014-10-081-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | increase whitespace below headings in settingsJan-Christoph Borchardt2014-10-081-1/+1
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-0815-64/+70
|/ /
* | Revert "fix for issue #10880"Vincent Petry2014-10-071-1/+1
* | Merge pull request #11428 from michag86/patch-1Morris Jobke2014-10-071-3/+6
|\ \
| * | restrict $div to local scopemichag862014-10-071-1/+1
| * | variable for found avatar divmichag862014-10-071-4/+5
| * | fix for issue #10483michag862014-10-061-2/+4
* | | Merge pull request #11451 from owncloud/reduce-bottom-paddingMorris Jobke2014-10-071-1/+1
|\ \ \
| * | | reduce bottom padding in filelist, fix perceived glitching, fix #11213Jan-Christoph Borchardt2014-10-071-1/+1
* | | | fix for issue #10880michag862014-10-071-1/+1
* | | | Merge pull request #11378 from owncloud/sort-indicator-styleVincent Petry2014-10-071-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | fix position and style of sort indicatorJan-Christoph Borchardt2014-10-011-5/+9
* | | | Merge pull request #11437 from owncloud/add-import-filterMorris Jobke2014-10-071-1/+10
|\ \ \ \
| * | | | Add CssImportFilter. More elegant fix for documents#348Victor Dubiniuk2014-10-061-1/+10
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0717-18/+31
|/ / / /
* | | | Merge pull request #11390 from Nemesiz/masterMorris Jobke2014-10-061-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Preview large TXT files fixNmz2014-10-021-1/+1
* | | | Merge pull request #11392 from owncloud/fix_version_previewsMorris Jobke2014-10-062-3/+46
|\ \ \ \ | |_|_|/ |/| | |
| * | | we also encrypt/decrypt files in the versions folder for previews and if encr...Bjoern Schiessle2014-10-062-3/+46
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0621-13/+65
* | | Merge pull request #11424 from owncloud/add-assets-to-gitignoreMorris Jobke2014-10-051-0/+1
|\ \ \
| * | | add /assets to gitignoreMorris Jobke2014-10-051-0/+1
|/ / /