Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | | | | Fix PHPDoc | Lukas Reschke | 2014-09-30 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #11366 from owncloud/invalid-doc | Morris Jobke | 2014-09-30 | 1 | -3/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Remove invalid PHPDoc | ||||
| * | | | | Remove invalid PHPDoc | Lukas Reschke | 2014-09-30 | 1 | -3/+3 |
| |/ / / | | | | | | | | | | | | | Despite the documentation this function does not read values from the cookie | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-30 | 24 | -76/+119 |
| | | | | |||||
* | | | | Merge pull request #11337 from danbartram/better_encryption_recovery_labels | Lukas Reschke | 2014-09-29 | 2 | -4/+8 |
|\ \ \ \ | |/ / / |/| | | | Add clickable labels to encryption recovery radios | ||||
| * | | | Add clickable labels to encryption recovery radios | Dan Bartram | 2014-09-27 | 2 | -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-previews | Lukas Reschke | 2014-09-29 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Close the session for preview generation | ||||
| * | | | | Close the session for preview generation | Lukas Reschke | 2014-09-29 | 1 | -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_config | Lukas Reschke | 2014-09-29 | 2 | -0/+52 |
|\ \ \ \ \ | | | | | | | | | | | | | Add a CLI command that creates an empty LDAP config | ||||
| * | | | | | Add a CLI command that creates an empty LDAP config | Martin Konrad | 2014-09-29 | 2 | -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_shares | Lukas Reschke | 2014-09-29 | 14 | -429/+743 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [sharing] group shares | ||||
| * | | | | | | some small fixed, suggested by scrutinizer | Bjoern Schiessle | 2014-09-29 | 5 | -10/+9 |
| | | | | | | | |||||
| * | | | | | | throw a exception if we can't handle the provided path | Bjoern Schiessle | 2014-09-29 | 4 | -3/+75 |
| | | | | | | | |||||
| * | | | | | | on unshare only unshare childrens if there is no other parent available | Bjoern Schiessle | 2014-09-26 | 2 | -15/+63 |
| | | | | | | | |||||
| * | | | | | | only create a new share entry, if the user needs a different target name ↵ | Bjoern Schiessle | 2014-09-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | than the group share | ||||
| * | | | | | | for group shares we don't need a extra db entry of groupTarget equals itemTarget | Bjoern Schiessle | 2014-09-26 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | for group shares only the parent has the up-to-date permission. Make sure ↵ | Bjoern Schiessle | 2014-09-26 | 1 | -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 Schiessle | 2014-09-25 | 3 | -35/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | checks are executed, e.g. to check if the share is really visible | ||||
| * | | | | | | always select permissions, used in getItems() | Bjoern Schiessle | 2014-09-25 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | some small fixes | Bjoern Schiessle | 2014-09-25 | 4 | -11/+6 |
| | | | | | | | |||||
| * | | | | | | clear share table after each test run | Bjoern Schiessle | 2014-09-24 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | only add a new row if it isn't a unique share, otherwise update the existing row | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | mark exclude list as deprecated. It neither used by the files app nor by the | Bjoern Schiessle | 2014-09-24 | 1 | -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 tests | Bjoern Schiessle | 2014-09-24 | 2 | -5/+22 |
| | | | | | | | |||||
| * | | | | | | fix add user to group to work with grouped shares | Bjoern Schiessle | 2014-09-24 | 1 | -10/+18 |
| | | | | | | | |||||
| * | | | | | | generateTarget() will always find a unique target | Bjoern Schiessle | 2014-09-24 | 2 | -96/+80 |
| | | | | | | | |||||
| * | | | | | | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 4 | -48/+155 |
| | | | | | | | |||||
| * | | | | | | group shares and combine permissions | Bjoern Schiessle | 2014-09-22 | 4 | -240/+278 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #11357 from owncloud/kill-dead-code | Thomas Müller | 2014-09-29 | 2 | -18/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Remove dead code | ||||
| * | | | | | | Remove dead code | Lukas Reschke | 2014-09-29 | 2 | -18/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detection | Lukas Reschke | 2014-09-29 | 1 | -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 support | Arthur Schiwon | 2014-09-26 | 1 | -2/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #11324 from owncloud/tryToCreateDatadirectory | Lukas Reschke | 2014-09-29 | 1 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Try to create datadirectory to test whether the .htaccess works | ||||
| * | | | | | | Try to create datadirectory to test whether the .htaccess works | Lukas Reschke | 2014-09-26 | 1 | -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 transifex | Jenkins for ownCloud | 2014-09-29 | 30 | -19/+78 |
| | | | | | | |||||
* | | | | | | Merge pull request #11322 from owncloud/adding-unittest-helper | Thomas Müller | 2014-09-29 | 1 | -0/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding test helper to test private methods |