Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove debug output | Arthur Schiwon | 2014-10-09 | 1 | -1/+0 |
| | |||||
* | fix triggering of group update counts. improves the basic code which is also ↵ | Arthur Schiwon | 2014-10-09 | 2 | -14/+15 |
| | | | | responsible for user counts. i did not find regressions, please doublecheck | ||||
* | bump version | Arthur Schiwon | 2014-10-09 | 1 | -1/+1 |
| | |||||
* | smaller corrections to make scruitinizer happier, no effective changes | Arthur Schiwon | 2014-10-08 | 3 | -13/+16 |
| | |||||
* | more beautiful white spaces | Arthur Schiwon | 2014-10-08 | 1 | -88/+88 |
| | |||||
* | rename internal var name to avoid collision | Arthur Schiwon | 2014-10-08 | 2 | -7/+7 |
| | |||||
* | confirmation before switching to assisted mode when admin is experienced | Arthur Schiwon | 2014-10-08 | 1 | -38/+77 |
| | |||||
* | user and group counts are only upated on demand in experienced mode | Arthur Schiwon | 2014-10-08 | 6 | -15/+98 |
| | |||||
* | Objectlasses, Groups and Attributes are now loaded only in assisted mode and ↵ | Arthur Schiwon | 2014-10-08 | 3 | -13/+72 |
| | | | | only once | ||||
* | sets user filters to raw mode when marking user as experienced | Arthur Schiwon | 2014-10-07 | 3 | -0/+66 |
| | |||||
* | must be empty not auto | Arthur Schiwon | 2014-10-07 | 1 | -2/+2 |
| | |||||
* | add checkbox for experienced users to server tab | Arthur Schiwon | 2014-10-07 | 3 | -0/+23 |
| | |||||
* | Merge pull request #11428 from michag86/patch-1 | Morris Jobke | 2014-10-07 | 1 | -3/+6 |
|\ | | | | | fix for issue #10483 | ||||
| * | restrict $div to local scope | michag86 | 2014-10-07 | 1 | -1/+1 |
| | | |||||
| * | variable for found avatar div | michag86 | 2014-10-07 | 1 | -4/+5 |
| | | |||||
| * | fix for issue #10483 | michag86 | 2014-10-06 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #11451 from owncloud/reduce-bottom-padding | Morris Jobke | 2014-10-07 | 1 | -1/+1 |
|\ \ | | | | | | | reduce bottom padding in filelist, fix perceived glitching, fix #11213 | ||||
| * | | reduce bottom padding in filelist, fix perceived glitching, fix #11213 | Jan-Christoph Borchardt | 2014-10-07 | 1 | -1/+1 |
| | | | |||||
* | | | fix for issue #10880 | michag86 | 2014-10-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #11378 from owncloud/sort-indicator-style | Vincent Petry | 2014-10-07 | 1 | -5/+9 |
|\ \ \ | |/ / |/| | | fix position and style of sort indicator | ||||
| * | | fix position and style of sort indicator | Jan-Christoph Borchardt | 2014-10-01 | 1 | -5/+9 |
| | | | |||||
* | | | Merge pull request #11437 from owncloud/add-import-filter | Morris Jobke | 2014-10-07 | 1 | -1/+10 |
|\ \ \ | | | | | | | | | Add CssImportFilter. More elegant fix for documents#348 | ||||
| * | | | Add CssImportFilter. More elegant fix for documents#348 | Victor Dubiniuk | 2014-10-06 | 1 | -1/+10 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-07 | 17 | -18/+31 |
|/ / / | |||||
* | | | Merge pull request #11390 from Nemesiz/master | Morris Jobke | 2014-10-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Preview large TXT files fix | ||||
| * | | | Preview large TXT files fix | Nmz | 2014-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Limit the size of the string generating the preview image for TXT files | ||||
* | | | | Merge pull request #11392 from owncloud/fix_version_previews | Morris Jobke | 2014-10-06 | 2 | -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 Schiessle | 2014-10-06 | 2 | -3/+46 |
| |/ / | | | | | | | | | | encryption is enabled/disabled | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-06 | 21 | -13/+65 |
| | | | |||||
* | | | Merge pull request #11424 from owncloud/add-assets-to-gitignore | Morris Jobke | 2014-10-05 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | add /assets to gitignore | ||||
| * | | | add /assets to gitignore | Morris Jobke | 2014-10-05 | 1 | -0/+1 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-05 | 16 | -19/+21 |
| | | | |||||
* | | | Merge pull request #11411 from oparoz/imagick-bitmap-previews | Morris Jobke | 2014-10-04 | 6 | -100/+128 |
|\ \ \ | | | | | | | | | Bitmap class to handle all Imagick conversions to bitmap | ||||
| * | | | New generic class for Imagemagick conversions | Olivier Paroz | 2014-10-04 | 6 | -100/+128 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-04 | 14 | -12/+27 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-03 | 12 | -12/+12 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-02 | 15 | -15/+17 |
| | | |||||
* | | Merge pull request #10104 from owncloud/s3-overwrite | Lukas Reschke | 2014-10-01 | 2 | -43/+52 |
|\ \ | | | | | | | Fix S3 copy and rename overwriting target directory | ||||
| * | | Skip test for unsuported feature for amazon s3 | Robin Appelman | 2014-09-17 | 1 | -0/+4 |
| | | | |||||
| * | | Fix copy overwrite for amazon s3 | Robin Appelman | 2014-09-17 | 1 | -12/+4 |
| | | | |||||
| * | | Fix amazon s3 rename overwrite | Robin Appelman | 2014-09-17 | 1 | -2/+10 |
| | | | |||||
| * | | Fix AmazonS3 rmdir on the root | Robin Appelman | 2014-09-17 | 2 | -38/+43 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-01 | 19 | -19/+55 |
| | | | |||||
* | | | Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain | Lukas Reschke | 2014-10-01 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | Redirect only to absolute URL | ||||
| * | | | Redirect only to absolute URL | Lukas Reschke | 2014-09-29 | 1 | -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-previews | Lukas Reschke | 2014-10-01 | 2 | -23/+31 |
|\ \ \ | | | | | | | | | Use SVG previews for public sharing | ||||
| * | | | Use SVG previews for public sharing | Lukas Reschke | 2014-09-30 | 2 | -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/addFilelockToConfig | Lukas Reschke | 2014-10-01 | 3 | -123/+181 |
|\ \ \ \ | | | | | | | | | | | Add flock to config | ||||
| * | | | | Add flock to config | Lukas Reschke | 2014-09-30 | 3 | -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 | ||||
* | | | | Merge pull request #11365 from owncloud/fix-phpdoc | Morris Jobke | 2014-09-30 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix PHPDoc |