summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | | | Merge pull request #11365 from owncloud/fix-phpdocMorris Jobke2014-09-301-4/+4
|\ \ \ \ | | | | | | | | | | Fix PHPDoc
| * | | | Fix PHPDocLukas Reschke2014-09-301-4/+4
| | | | |
* | | | | Merge pull request #11366 from owncloud/invalid-docMorris Jobke2014-09-301-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Remove invalid PHPDoc
| * | | | Remove invalid PHPDocLukas Reschke2014-09-301-3/+3
| |/ / / | | | | | | | | | | | | Despite the documentation this function does not read values from the cookie
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-3024-76/+119
| | | |
* | | | Merge pull request #11337 from danbartram/better_encryption_recovery_labelsLukas Reschke2014-09-292-4/+8
|\ \ \ \ | |/ / / |/| | | Add clickable labels to encryption recovery radios
| * | | Add clickable labels to encryption recovery radiosDan Bartram2014-09-272-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clickable radio button labels to the encryption recovery settings pages: * settings-admin * settings-personal Pressing on the radio button text now toggles the state of the radio button.
* | | | Merge pull request #11352 from owncloud/close-session-for-previewsLukas Reschke2014-09-291-0/+1
|\ \ \ \ | | | | | | | | | | Close the session for preview generation
| * | | | Close the session for preview generationLukas Reschke2014-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
* | | | | Merge pull request #11347 from mark0n/create_empty_configLukas Reschke2014-09-292-0/+52
|\ \ \ \ \ | | | | | | | | | | | | Add a CLI command that creates an empty LDAP config
| * | | | | Add a CLI command that creates an empty LDAP configMartin Konrad2014-09-292-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to configure the user_ldap app without using the wizard (e.g. using tools like Puppet).
* | | | | | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-2914-429/+743
|\ \ \ \ \ \ | | | | | | | | | | | | | | [sharing] group shares
| * | | | | | some small fixed, suggested by scrutinizerBjoern Schiessle2014-09-295-10/+9
| | | | | | |
| * | | | | | throw a exception if we can't handle the provided pathBjoern Schiessle2014-09-294-3/+75
| | | | | | |
| * | | | | | on unshare only unshare childrens if there is no other parent availableBjoern Schiessle2014-09-262-15/+63
| | | | | | |
| * | | | | | only create a new share entry, if the user needs a different target name ↵Bjoern Schiessle2014-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | than the group share
| * | | | | | for group shares we don't need a extra db entry of groupTarget equals itemTargetBjoern Schiessle2014-09-261-3/+3
| | | | | | |
| * | | | | | for group shares only the parent has the up-to-date permission. Make sure ↵Bjoern Schiessle2014-09-261-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
| * | | | | | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all ↵Bjoern Schiessle2014-09-253-35/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | checks are executed, e.g. to check if the share is really visible
| * | | | | | always select permissions, used in getItems()Bjoern Schiessle2014-09-251-2/+3
| | | | | | |
| * | | | | | some small fixesBjoern Schiessle2014-09-254-11/+6
| | | | | | |
| * | | | | | clear share table after each test runBjoern Schiessle2014-09-241-0/+3
| | | | | | |
| * | | | | | only add a new row if it isn't a unique share, otherwise update the existing rowBjoern Schiessle2014-09-241-1/+1
| | | | | | |
| * | | | | | mark exclude list as deprecated. It neither used by the files app nor by theBjoern Schiessle2014-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calendar or contacts app. It doesn't make sense to build a exclude list by the share API, the apps knows best which are valid targets.
| * | | | | | fix unit testsBjoern Schiessle2014-09-242-5/+22
| | | | | | |
| * | | | | | fix add user to group to work with grouped sharesBjoern Schiessle2014-09-241-10/+18
| | | | | | |
| * | | | | | generateTarget() will always find a unique targetBjoern Schiessle2014-09-242-96/+80
| | | | | | |
| * | | | | | unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-224-48/+155
| | | | | | |
| * | | | | | group shares and combine permissionsBjoern Schiessle2014-09-224-240/+278
| | | | | | |
* | | | | | | Merge pull request #11357 from owncloud/kill-dead-codeThomas Müller2014-09-292-18/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Remove dead code
| * | | | | | Remove dead codeLukas Reschke2014-09-292-18/+0
|/ / / / / /
* | | | | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detectionLukas Reschke2014-09-291-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | dn needs to be fetched to be able to detect memberOf support
| * | | | | | dn needs to be fetched to be able to detect memberOf supportArthur Schiwon2014-09-261-2/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11324 from owncloud/tryToCreateDatadirectoryLukas Reschke2014-09-291-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Try to create datadirectory to test whether the .htaccess works
| * | | | | | Try to create datadirectory to test whether the .htaccess worksLukas Reschke2014-09-261-1/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2930-19/+78
| | | | | |
* | | | | | Merge pull request #11322 from owncloud/adding-unittest-helperThomas Müller2014-09-291-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding test helper to test private methods