aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ignore "parent" shares when the sharee is the owner of the reshare-sourceJoas Schilling2015-04-291-0/+2
* Correctly select file cache values also when checking group sharesJoas Schilling2015-04-291-7/+7
* Add a test to share a subfolder of a folder shared with the owner by groupJoas Schilling2015-04-291-0/+33
* Added unit test for reshare by share ownerVincent Petry2015-04-291-0/+25
* Do not restrict permissions for the original ownerJoas Schilling2015-04-291-1/+1
* Merge pull request #15911 from owncloud/enc_create_header_for_new_keyBjörn Schießle2015-04-292-3/+14
|\
| * make sure that we create a header for the encrypted private keyBjoern Schiessle2015-04-282-3/+14
* | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \
| * | move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
* | | Merge pull request #15922 from JostBaron/patch-1Thomas Müller2015-04-291-2/+2
|\ \ \
| * | | Fix error message when wrong user on consoleJost Baron2015-04-281-2/+2
* | | | Merge pull request #15921 from cmeh/patch-4Thomas Müller2015-04-291-1/+1
|\ \ \ \
| * | | | Update wizardTabElementary.jscmeh2015-04-281-1/+1
| |/ / /
* | | | Merge pull request #15918 from owncloud/harden-avatarJoas Schilling2015-04-293-4/+34
|\ \ \ \
| * | | | Filter potential dangerous filenames for avatarsLukas Reschke2015-04-283-4/+34
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-04-298-112/+116
|/ / /
* | | Merge pull request #15915 from owncloud/fix-sharingThomas Müller2015-04-281-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix routesLukas Reschke2015-04-281-4/+4
|/ /
* | Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjsThomas Müller2015-04-281-0/+4
|\ \
| * | 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
|\ \ \
| * | | 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
| * | | 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
|\ \ \ \
| * | | | save configs when requesting a config ID. They are empty, but avoid configID ...Arthur Schiwon2015-04-211-2/+2
| * | | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, f...Arthur Schiwon2015-04-211-11/+23
* | | | | Merge pull request #15896 from owncloud/autotest-external-replacecommandThomas Müller2015-04-281-0/+5
|\ \ \ \ \
| * | | | | 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.phpJoas Schilling2015-04-282-10/+24
* | | | | | | Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-docThomas Müller2015-04-282-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |