summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-3144-86/+120
* Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-303-4/+46
|\
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-1/+3
| * Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| * Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3064-66/+42
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-292-57/+118
|\ \
| * | Fix intendationJoas Schilling2015-01-291-3/+3
| * | Fix more assertionsJoas Schilling2015-01-291-26/+26
| * | Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| * | make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-292-32/+93
* | | Merge pull request #13728 from owncloud/federated_cloudThomas Müller2015-01-292-5/+5
|\ \ \ | |_|/ |/| |
| * | rename 'server-to-server sharing' to 'federated cloud'Bjoern Schiessle2015-01-292-5/+5
| |/
* | Merge pull request #13746 from owncloud/no-groups-provisioning-apiThomas Müller2015-01-292-1/+5
|\ \
| * | disallow provisioning api to be enabled for groups onlyThomas Müller2015-01-292-1/+5
* | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-stepThomas Müller2015-01-293-21/+115
|\ \ \
| * | | user fs must be setup up, so that the real user folder is mounted on the user...Arthur Schiwon2015-01-221-0/+1
| * | | adding console command to migrate encryption keys - refs #13450Thomas Müller2015-01-223-21/+114
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2924-0/+48
| |/ / |/| |
* | | Merge pull request #13401 from is-apps/amazon_s3_checkboxesThomas Müller2015-01-281-1/+7
|\ \ \
| * | | Align checkbox configuration in external filesRoss Nicoll2015-01-191-1/+7
* | | | Fix trash error when deleting files with the same name at the same time (happ...Robin Appelman2015-01-281-0/+3
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2814-10/+46
* | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-284-25/+144
|\ \ \
| * | | Add back exit()Vincent Petry2015-01-261-1/+1
| * | | Catch storage exception in scanner for remote sharesVincent Petry2015-01-264-25/+144
* | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-277-4/+226
|\ \ \ \
| * | | | Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-263-0/+38
| * | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| * | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| * | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| * | | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-231-41/+2
| * | | | Remove storage wrapper for oc_trashbin in unit testVincent Petry2015-01-231-0/+2
| * | | | Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
| * | | | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
* | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
* | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
* | | | | Merge pull request #13679 from owncloud/public-disablesharejspluginThomas Müller2015-01-273-3/+30
|\ \ \ \ \
| * | | | | Do not disclose share owner in public file listVincent Petry2015-01-261-1/+4
| * | | | | Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
* | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \
| * | | | | | Only reload file list after remote share accept request returnsVincent Petry2015-01-262-4/+124
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-272-0/+2
|/ / / / /
* | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-267-39/+64
|\ \ \ \ \
| * | | | | certificate manager should always use a \OC\Files\View otherwise we will get ...Bjoern Schiessle2015-01-261-1/+26
| * | | | | certificate manager only needs the user-id, no need to pass on the complete u...Bjoern Schiessle2015-01-263-5/+6
| * | | | | use uid provided by setupfs hook to mount server2server shares, otherwise mou...Bjoern Schiessle2015-01-265-35/+34
* | | | | | Prevent double slash in shareinfo request URLVincent Petry2015-01-261-1/+1
|/ / / / /
* | | | | Remove duplicated definition of APIControllerJoas Schilling2015-01-261-12/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2516-14/+58
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 03:49:42 +0000