Commit Graph

20679 Commits

Author SHA1 Message Date
Arthur Schiwon b6fc7f5599 Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once 2014-10-08 11:38:39 +02:00
Arthur Schiwon 3ff4c8e3fc sets user filters to raw mode when marking user as experienced 2014-10-07 17:28:09 +02:00
Arthur Schiwon efd940133b must be empty not auto 2014-10-07 16:45:22 +02:00
Arthur Schiwon 67292a5345 add checkbox for experienced users to server tab 2014-10-07 16:43:58 +02:00
Morris Jobke 432cd4a5c2 Merge pull request #11428 from michag86/patch-1
fix for issue #10483
2014-10-07 15:00:31 +02:00
Morris Jobke 814bce4cac Merge pull request #11451 from owncloud/reduce-bottom-padding
reduce bottom padding in filelist, fix perceived glitching, fix #11213
2014-10-07 14:45:21 +02:00
michag86 0df070a8e4 fix for issue #10880 2014-10-07 14:30:14 +02:00
michag86 0039099f51 restrict $div to local scope 2014-10-07 11:09:07 +02:00
Vincent Petry 396a71b005 Merge pull request #11378 from owncloud/sort-indicator-style
fix position and style of sort indicator
2014-10-07 11:06:37 +02:00
michag86 f4a2ddbe31 variable for found avatar div 2014-10-07 10:44:36 +02:00
Jan-Christoph Borchardt 2b8066bff3 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 10:44:01 +02:00
Morris Jobke 6323d5fb3a Merge pull request #11437 from owncloud/add-import-filter
Add CssImportFilter. More elegant fix for documents#348
2014-10-07 08:28:08 +02:00
Jenkins for ownCloud 01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Victor Dubiniuk b6087ea79b Add CssImportFilter. More elegant fix for documents#348 2014-10-06 19:39:02 +03:00
Morris Jobke a6293a38f2 Merge pull request #11390 from Nemesiz/master
Preview large TXT files fix
2014-10-06 14:25:27 +02:00
Morris Jobke e5b4e54141 Merge pull request #11392 from owncloud/fix_version_previews
we also encrypt/decrypt files in the versions folder
2014-10-06 13:03:48 +02:00
Bjoern Schiessle 9147219377 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 12:02:08 +02:00
michag86 2849c75646 fix for issue #10483 2014-10-06 08:53:12 +02:00
Jenkins for ownCloud 6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Morris Jobke 96cdeb40ed Merge pull request #11424 from owncloud/add-assets-to-gitignore
add /assets to gitignore
2014-10-05 22:18:54 +02:00
Morris Jobke 7891873072 add /assets to gitignore 2014-10-05 21:19:25 +02:00
Jenkins for ownCloud f191e5b088 [tx-robot] updated from transifex 2014-10-05 01:54:50 -04:00
Morris Jobke 86931bdb89 Merge pull request #11411 from oparoz/imagick-bitmap-previews
Bitmap class to handle all Imagick conversions to bitmap
2014-10-04 18:26:59 +02:00
Olivier Paroz b0000800e1 New generic class for Imagemagick conversions 2014-10-04 17:50:12 +02:00
Jenkins for ownCloud 8d4078752d [tx-robot] updated from transifex 2014-10-04 01:54:35 -04:00
Jenkins for ownCloud 0cd0a180cc [tx-robot] updated from transifex 2014-10-03 01:54:35 -04:00
Nmz 83c2829ca8 Preview large TXT files fix
Limit the size of the string generating the preview image for TXT files
2014-10-02 12:47:39 +03:00
Jenkins for ownCloud 537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Jan-Christoph Borchardt 3cd6b99a0b fix position and style of sort indicator 2014-10-01 15:21:28 +02:00
Lukas Reschke 001f223baa Merge pull request #10104 from owncloud/s3-overwrite
Fix S3 copy and rename overwriting target directory
2014-10-01 13:07:28 +02:00
Jenkins for ownCloud 553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Lukas Reschke e762ff2bbd Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain
Redirect only to absolute URL
2014-10-01 12:47:43 +02:00
Lukas Reschke e93f98f1de Merge pull request #11368 from owncloud/use-svg-previews
Use SVG previews for public sharing
2014-10-01 11:15:50 +02:00
Lukas Reschke cbecd62287 Merge pull request #11303 from owncloud/addFilelockToConfig
Add flock to config
2014-10-01 10:43:18 +02:00
Morris Jobke 5beeb923e6 Merge pull request #11365 from owncloud/fix-phpdoc
Fix PHPDoc
2014-09-30 16:15:37 +02:00
Morris Jobke e881be7926 Merge pull request #11366 from owncloud/invalid-doc
Remove invalid PHPDoc
2014-09-30 16:12:58 +02:00
Lukas Reschke 68cf6681e5 Add flock to config
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
2014-09-30 15:53:27 +02:00
Lukas Reschke 306bf71c62 Use SVG previews for public sharing
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-09-30 15:49:49 +02:00
Lukas Reschke 67f8875f47 Remove invalid PHPDoc
Despite the documentation this function does not read values from the cookie
2014-09-30 13:46:43 +02:00
Lukas Reschke b4944ffcc5 Fix PHPDoc 2014-09-30 13:34:50 +02:00
Jenkins for ownCloud 5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Lukas Reschke 659b9fc030 Merge pull request #11337 from danbartram/better_encryption_recovery_labels
Add clickable labels to encryption recovery radios
2014-09-29 22:06:00 +02:00
Lukas Reschke 35465f5375 Merge pull request #11352 from owncloud/close-session-for-previews
Close the session for preview generation
2014-09-29 22:03:33 +02:00
Lukas Reschke b13b86502f Merge pull request #11347 from mark0n/create_empty_config
Add a CLI command that creates an empty LDAP config
2014-09-29 21:42:07 +02:00
Lukas Reschke 8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares
[sharing] group shares
2014-09-29 20:26:41 +02:00
Thomas Müller 9489852e94 Merge pull request #11357 from owncloud/kill-dead-code
Remove dead code
2014-09-29 20:25:20 +02:00
Lukas Reschke 41374986d3 Remove dead code 2014-09-29 17:20:29 +02:00
Lukas Reschke 6e7365fc17 Redirect only to absolute URL
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.
2014-09-29 17:07:43 +02:00
Lukas Reschke 6b45cb5416 Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
dn needs to be fetched to be able to detect memberOf support
2014-09-29 14:46:10 +02:00
Lukas Reschke ba2472575f Close the session for preview generation
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
2014-09-29 14:27:44 +02:00