aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix amazon s3 issuesJörn Friedrich Dreyer2014-10-083-110/+125
| | | | | | | | | | | | folder size and mtime is always unknown in s3 more s3 fixes make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings reduce number of http calls on remove and rmdir fix typo
* 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
|\ | | | | [encryption] some visual improvements
| * 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
|\ \ | | | | | | implement case-insensitive search for groups in sharing dialog
| * | 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 settings
| * | | 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
| | | | | | | | This reverts commit 0df070a8e4f6718e3cd86aa4d5a5fc62c53f6eee.
* | Merge pull request #11428 from michag86/patch-1Morris Jobke2014-10-071-3/+6
|\ \ | | | | | | fix for issue #10483
| * | 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 #11213
| * | | 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 indicator
| * | | 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#348
| * | | | 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 fix
| * | | Preview large TXT files fixNmz2014-10-021-1/+1
| | | | | | | | | | | | Limit the size of the string generating the preview image for TXT files
* | | | Merge pull request #11392 from owncloud/fix_version_previewsMorris Jobke2014-10-062-3/+46
|\ \ \ \ | |_|_|/ |/| | | we also encrypt/decrypt files in the versions folder
| * | | we also encrypt/decrypt files in the versions folder for previews and if ↵Bjoern Schiessle2014-10-062-3/+46
| |/ / | | | | | | | | | encryption is enabled/disabled
* | | [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 gitignore
| * | | add /assets to gitignoreMorris Jobke2014-10-051-0/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0516-19/+21
| | |
* | | Merge pull request #11411 from oparoz/imagick-bitmap-previewsMorris Jobke2014-10-046-100/+128
|\ \ \ | | | | | | | | Bitmap class to handle all Imagick conversions to bitmap
| * | | New generic class for Imagemagick conversionsOlivier Paroz2014-10-046-100/+128
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0414-12/+27
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-0312-12/+12
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0215-15/+17
| |
* | Merge pull request #10104 from owncloud/s3-overwriteLukas Reschke2014-10-012-43/+52
|\ \ | | | | | | Fix S3 copy and rename overwriting target directory
| * | Skip test for unsuported feature for amazon s3Robin Appelman2014-09-171-0/+4
| | |
| * | Fix copy overwrite for amazon s3Robin Appelman2014-09-171-12/+4
| | |
| * | Fix amazon s3 rename overwriteRobin Appelman2014-09-171-2/+10
| | |
| * | Fix AmazonS3 rmdir on the rootRobin Appelman2014-09-172-38/+43
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0119-19/+55
| | |
* | | Merge pull request #11356 from owncloud/redirect-only-to-the-same-domainLukas Reschke2014-10-011-2/+4
|\ \ \ | | | | | | | | Redirect only to absolute URL
| * | | Redirect only to absolute URLLukas Reschke2014-09-291-2/+4
| | |/ | |/| | | | | | | We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
* | | Merge pull request #11368 from owncloud/use-svg-previewsLukas Reschke2014-10-012-23/+31
|\ \ \ | | | | | | | | Use SVG previews for public sharing
| * | | Use SVG previews for public sharingLukas Reschke2014-09-302-23/+31
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
* | | | Merge pull request #11303 from owncloud/addFilelockToConfigLukas Reschke2014-10-013-123/+181
|\ \ \ \ | | | | | | | | | | Add flock to config
| * | | | Add flock to configLukas Reschke2014-09-303-123/+181
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070 Testplan: - [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable - [ ] Installation still works - [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu) - [ ] Your PC didn't blow up - [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation Only skip the main config Otherwise read only additional configs might not be processed Test on tmpdir