summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * 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 URLLukas Reschke2014-09-291-2/+4
* | | Merge pull request #11368 from owncloud/use-svg-previewsLukas Reschke2014-10-012-23/+31
|\ \ \
| * | | Use SVG previews for public sharingLukas Reschke2014-09-302-23/+31
* | | | Merge pull request #11303 from owncloud/addFilelockToConfigLukas Reschke2014-10-013-123/+181
|\ \ \ \
| * | | | Add flock to configLukas Reschke2014-09-303-123/+181
| |/ / /
* | | | Merge pull request #11365 from owncloud/fix-phpdocMorris Jobke2014-09-301-4/+4
|\ \ \ \
| * | | | Fix PHPDocLukas Reschke2014-09-301-4/+4
* | | | | Merge pull request #11366 from owncloud/invalid-docMorris Jobke2014-09-301-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove invalid PHPDocLukas Reschke2014-09-301-3/+3
| |/ / /
* | | | [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 radiosDan Bartram2014-09-272-4/+8
* | | | Merge pull request #11352 from owncloud/close-session-for-previewsLukas Reschke2014-09-291-0/+1
|\ \ \ \
| * | | | Close the session for preview generationLukas Reschke2014-09-291-0/+1
* | | | | Merge pull request #11347 from mark0n/create_empty_configLukas Reschke2014-09-292-0/+52
|\ \ \ \ \
| * | | | | Add a CLI command that creates an empty LDAP configMartin Konrad2014-09-292-0/+52
* | | | | | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-2914-429/+743
|\ \ \ \ \ \
| * | | | | | 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 than...Bjoern Schiessle2014-09-261-1/+1
| * | | | | | 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 tha...Bjoern Schiessle2014-09-261-1/+12
| * | | | | | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c...Bjoern Schiessle2014-09-253-35/+66
| * | | | | | 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
| * | | | | | 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 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 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 worksLukas Reschke2014-09-261-1/+6
| |/ / / / /