Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Filter potential dangerous filenames for avatars | Lukas Reschke | 2015-04-28 | 3 | -4/+34 |
* | Merge pull request #15915 from owncloud/fix-sharing | Thomas Müller | 2015-04-28 | 1 | -4/+4 |
|\ | |||||
| * | Fix routes | Lukas Reschke | 2015-04-28 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjs | Thomas Müller | 2015-04-28 | 1 | -0/+4 |
|\ | |||||
| * | fix typo | Thomas Müller | 2015-04-27 | 1 | -1/+1 |
| * | handle case where the given language is unknown - refs #15794 | Thomas Müller | 2015-04-27 | 1 | -0/+4 |
* | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 29 | -219/+976 |
|\ \ | |||||
| * | | dont pass floats as timestamp to the changepropagator | Robin Appelman | 2015-04-27 | 1 | -1/+1 |
| * | | safer teardown | Robin Appelman | 2015-04-27 | 1 | -1/+3 |
| * | | use microtime to prevent race conditions | Robin Appelman | 2015-04-27 | 1 | -3/+3 |
| * | | cleanup hooks | Robin Appelman | 2015-04-27 | 1 | -0/+7 |
| * | | fix test | Robin Appelman | 2015-04-27 | 1 | -1/+0 |
| * | | triger propagation for webdav uploads | Robin Appelman | 2015-04-27 | 2 | -3/+4 |
| * | | fix merge | Robin Appelman | 2015-04-27 | 4 | -116/+76 |
| * | | fix propagation when renaming a directly reshared folder | Robin Appelman | 2015-04-27 | 2 | -2/+8 |
| * | | minor fixes | Robin Appelman | 2015-04-27 | 4 | -10/+10 |
| * | | add rename hook for propagation | Robin Appelman | 2015-04-27 | 2 | -0/+16 |
| * | | propagate changes up reshares | Robin Appelman | 2015-04-27 | 1 | -0/+10 |
| * | | Make sure the owner mountpoints are setup | Robin Appelman | 2015-04-27 | 2 | -1/+5 |
| * | | more propagation tests | Robin Appelman | 2015-04-27 | 4 | -245/+429 |
| * | | remove duplicates from rebase | Robin Appelman | 2015-04-27 | 1 | -48/+0 |
| * | | adjust test | Robin Appelman | 2015-04-27 | 2 | -2/+7 |
| * | | dont use our now non existing hook | Robin Appelman | 2015-04-27 | 3 | -3/+9 |
| * | | propagate etags for all user of a share | Robin Appelman | 2015-04-27 | 14 | -93/+521 |
| * | | Allow getting *all* share entries owned by a user | Robin Appelman | 2015-04-27 | 2 | -1/+15 |
| * | | Make the change propagator an emitter | Robin Appelman | 2015-04-27 | 2 | -1/+8 |
| * | | unit test for etag propagation across shared storage boundary | Robin Appelman | 2015-04-27 | 1 | -2/+158 |
* | | | Merge pull request #15773 from owncloud/fix-15766 | Thomas Müller | 2015-04-28 | 2 | -13/+25 |
|\ \ \ | |||||
| * | | | save configs when requesting a config ID. They are empty, but avoid configID ... | Arthur Schiwon | 2015-04-21 | 1 | -2/+2 |
| * | | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, f... | Arthur Schiwon | 2015-04-21 | 1 | -11/+23 |
* | | | | Merge pull request #15896 from owncloud/autotest-external-replacecommand | Thomas Müller | 2015-04-28 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | Add check for "replace" command | Vincent Petry | 2015-04-27 | 1 | -0/+5 |
* | | | | | Merge pull request #15901 from owncloud/fix-share-docs | Morris Jobke | 2015-04-28 | 2 | -10/+24 |
|\ \ \ \ \ | |||||
| * | | | | | fix several issues with doc blocks on share.php | Joas Schilling | 2015-04-28 | 2 | -10/+24 |
* | | | | | | Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-doc | Thomas Müller | 2015-04-28 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix return type of the getRootFolder() method | Joas Schilling | 2015-04-28 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-28 | 8 | -2/+10 |
* | | | | | Merge pull request #15893 from owncloud/files-fixnewfilevalidation | Morris Jobke | 2015-04-27 | 2 | -10/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Fix file name validation in New menu | Vincent Petry | 2015-04-27 | 2 | -10/+61 |
| |/ / / / | |||||
* | | | | | Merge pull request #15891 from owncloud/LukasReschke-patch-1 | Lukas Reschke | 2015-04-27 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Simplify even more | Lukas Reschke | 2015-04-27 | 1 | -2/+2 |
| * | | | | Rephrase "TL;DR" | Lukas Reschke | 2015-04-27 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #15890 from owncloud/fix-helper-docs | Thomas Müller | 2015-04-27 | 1 | -4/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix several type(hint) errors in private/helper.php | Joas Schilling | 2015-04-27 | 1 | -4/+5 |
* | | | | Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path | Thomas Müller | 2015-04-27 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Can't use function return value in write context | Joas Schilling | 2015-04-27 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 2 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | fixes #15848 | Thomas Müller | 2015-04-27 | 2 | -1/+7 |
| |/ / / | |||||
* | | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 8 | -20/+88 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 8 | -20/+88 |