summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjsThomas Müller2015-04-281-0/+4
|\ | | | | handle case where the given language is unknown - refs #15794
| * fix typoThomas Müller2015-04-271-1/+1
| |
| * handle case where the given language is unknown - refs #15794Thomas Müller2015-04-271-0/+4
| |
* | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-2829-219/+976
|\ \ | | | | | | Propagate etags across shared storages
| * | dont pass floats as timestamp to the changepropagatorRobin Appelman2015-04-271-1/+1
| | |
| * | safer teardownRobin Appelman2015-04-271-1/+3
| | |
| * | use microtime to prevent race conditionsRobin Appelman2015-04-271-3/+3
| | |
| * | cleanup hooksRobin Appelman2015-04-271-0/+7
| | |
| * | fix testRobin Appelman2015-04-271-1/+0
| | |
| * | triger propagation for webdav uploadsRobin Appelman2015-04-272-3/+4
| | | | | | | | | | | | use post hooks for share etag propagator
| * | fix mergeRobin Appelman2015-04-274-116/+76
| | |
| * | fix propagation when renaming a directly reshared folderRobin Appelman2015-04-272-2/+8
| | |
| * | minor fixesRobin Appelman2015-04-274-10/+10
| | |
| * | add rename hook for propagationRobin Appelman2015-04-272-0/+16
| | |
| * | propagate changes up resharesRobin Appelman2015-04-271-0/+10
| | |
| * | Make sure the owner mountpoints are setupRobin Appelman2015-04-272-1/+5
| | |
| * | more propagation testsRobin Appelman2015-04-274-245/+429
| | |
| * | remove duplicates from rebaseRobin Appelman2015-04-271-48/+0
| | |
| * | adjust testRobin Appelman2015-04-272-2/+7
| | |
| * | dont use our now non existing hookRobin Appelman2015-04-273-3/+9
| | |
| * | propagate etags for all user of a shareRobin Appelman2015-04-2714-93/+521
| | |
| * | Allow getting *all* share entries owned by a userRobin Appelman2015-04-272-1/+15
| | |
| * | Make the change propagator an emitterRobin Appelman2015-04-272-1/+8
| | |
| * | unit test for etag propagation across shared storage boundaryRobin Appelman2015-04-271-2/+158
| | |
* | | Merge pull request #15773 from owncloud/fix-15766Thomas Müller2015-04-282-13/+25
|\ \ \ | | | | | | | | LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
| * | | save configs when requesting a config ID. They are empty, but avoid configID ↵Arthur Schiwon2015-04-211-2/+2
| | | | | | | | | | | | | | | | collisioning when creating many new configs in the wizard without saving anything directly.
| * | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, ↵Arthur Schiwon2015-04-211-11/+23
| | | | | | | | | | | | | | | | fixes #15766
* | | | Merge pull request #15896 from owncloud/autotest-external-replacecommandThomas Müller2015-04-281-0/+5
|\ \ \ \ | | | | | | | | | | Add check for "replace" command in autotest-external
| * | | | Add check for "replace" commandVincent Petry2015-04-271-0/+5
| | | | |
* | | | | Merge pull request #15901 from owncloud/fix-share-docsMorris Jobke2015-04-282-10/+24
|\ \ \ \ \ | | | | | | | | | | | | fix several issues with doc blocks on share.php
| * | | | | fix several issues with doc blocks on share.phpJoas Schilling2015-04-282-10/+24
| | | | | |
* | | | | | Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-docThomas Müller2015-04-282-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix return type of the getRootFolder() method
| * | | | | Fix return type of the getRootFolder() methodJoas Schilling2015-04-282-2/+2
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-288-2/+10
| | | | |
* | | | | Merge pull request #15893 from owncloud/files-fixnewfilevalidationMorris Jobke2015-04-272-10/+61
|\ \ \ \ \ | | | | | | | | | | | | Fix file name validation in New menu
| * | | | | Fix file name validation in New menuVincent Petry2015-04-272-10/+61
| |/ / / /
* | | | | Merge pull request #15891 from owncloud/LukasReschke-patch-1Lukas Reschke2015-04-271-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Rephrase "TL;DR"
| * | | | Simplify even moreLukas Reschke2015-04-271-2/+2
| | | | |
| * | | | Rephrase "TL;DR"Lukas Reschke2015-04-271-1/+1
| | |_|/ | |/| | | | | | "TL;DR" seems not to be understood or respected by everyone. Maybe we should do a try with "Important". Open for alternative suggestions.
* | | | Merge pull request #15890 from owncloud/fix-helper-docsThomas Müller2015-04-271-4/+5
|\ \ \ \ | |/ / / |/| | | Fix several type(hint) errors in private/helper.php
| * | | Fix several type(hint) errors in private/helper.phpJoas Schilling2015-04-271-4/+5
| | | |
* | | | Merge pull request #15887 from owncloud/issue-15885-empty-getenv-pathThomas Müller2015-04-271-1/+2
|\ \ \ \ | | | | | | | | | | Can't use function return value in write context
| * | | | Can't use function return value in write contextJoas Schilling2015-04-271-1/+2
| |/ / /
* | | | Merge pull request #15886 from owncloud/fix-15848-masterThomas Müller2015-04-272-1/+7
|\ \ \ \ | | | | | | | | | | Adjust isLocal() on encryption wrapper
| * | | | fixes #15848Thomas Müller2015-04-272-1/+7
| |/ / /
* | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-278-20/+88
|\ \ \ \ | |/ / / |/| | | [encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
| * | | fall back to the ownCloud default encryption module and aes128 if we read a ↵Bjoern Schiessle2015-04-278-20/+88
| | | | | | | | | | | | | | | | encrypted file without a header
* | | | Merge pull request #15882 from owncloud/fix-type-annotationMorris Jobke2015-04-272-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fix type annotation
| * | | Fix type annotationLukas Reschke2015-04-272-2/+2
| | | | | | | | | | | | | | | | Obviously should be an int
* | | | Merge pull request #15411 from mmattel/fix_for_15375_better_message_textThomas Müller2015-04-271-0/+1
|\ \ \ \ | | | | | | | | | | Improve error messge text for app upgrade try (#15375)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 00:48:57 +0000