| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15937 from owncloud/file-locking | Thomas Müller | 2015-05-01 | 10 | -23/+588 |
|\ |
|
| * | allow getting the path from the lockedexception | Robin Appelman | 2015-04-30 | 2 | -2/+23 |
| * | use trait for cas polyfill for xcache | Robin Appelman | 2015-04-30 | 1 | -24/+2 |
| * | add memcache based shared/exclusive locking | Robin Appelman | 2015-04-30 | 3 | -0/+158 |
| * | add compare and swap to memcache | Robin Appelman | 2015-04-30 | 7 | -2/+132 |
| * | extends memcache with add, inc and dec | Robin Appelman | 2015-04-30 | 6 | -22/+300 |
* | | Merge pull request #15964 from owncloud/fix-l10n-string-warn | Thomas Müller | 2015-04-30 | 1 | -2/+0 |
|\ \ |
|
| * | | fix #15962 | Bernhard Posselt | 2015-04-30 | 1 | -2/+0 |
| |/ |
|
* / | use the preSetup hook to ensure the encryption wrapper is applied correctly | Robin Appelman | 2015-04-30 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #15949 from owncloud/l10n-string-json | Thomas Müller | 2015-04-30 | 1 | -1/+9 |
|\ |
|
| * | implement json serialize for l10n string | Bernhard Posselt | 2015-04-29 | 1 | -1/+9 |
* | | Merge pull request #15946 from owncloud/auto-controller-resolve | Thomas Müller | 2015-04-30 | 1 | -0/+11 |
|\ \ |
|
| * | | add aliases to pascal case constructor paramters to make it possible to auto ... | Bernhard Posselt | 2015-04-29 | 1 | -0/+11 |
| |/ |
|
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 6 | -16/+18 |
|/ |
|
* | Merge pull request #15596 from owncloud/issue/15589 | Morris Jobke | 2015-04-29 | 1 | -6/+9 |
|\ |
|
| * | Fix scrutinizer complains and return type doc | Joas Schilling | 2015-04-28 | 1 | -4/+6 |
| * | Correctly remove the protocol before prepeding it | Joas Schilling | 2015-04-28 | 1 | -0/+1 |
| * | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 1 | -2/+2 |
* | | Merge pull request #15906 from rullzer/fix_15777 | Morris Jobke | 2015-04-29 | 1 | -1/+1 |
|\ \ |
|
| * | | Password set via OCS API should not be double escaped | Roeland Jago Douma | 2015-04-28 | 1 | -1/+1 |
* | | | Filter potential dangerous filenames for avatars | Lukas Reschke | 2015-04-28 | 2 | -4/+11 |
| |/
|/| |
|
* | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 5 | -1/+37 |
|\ \ |
|
| * | | triger propagation for webdav uploads | Robin Appelman | 2015-04-27 | 1 | -0/+1 |
| * | | fix propagation when renaming a directly reshared folder | Robin Appelman | 2015-04-27 | 1 | -0/+4 |
| * | | propagate etags for all user of a share | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| * | | Allow getting *all* share entries owned by a user | Robin Appelman | 2015-04-27 | 1 | -0/+12 |
| * | | Make the change propagator an emitter | Robin Appelman | 2015-04-27 | 2 | -1/+8 |
* | | | 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 |
* | | | Fix return type of the getRootFolder() method | Joas Schilling | 2015-04-28 | 2 | -2/+2 |
|/ / |
|
* | | 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 #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
|\ \ \ |
|
| * | | | fixes #15848 | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
| |/ / |
|
* | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 3 | -15/+38 |
|\ \ \
| |/ /
|/| | |
|
| * | | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 3 | -15/+38 |
* | | | Merge pull request #15882 from owncloud/fix-type-annotation | Morris Jobke | 2015-04-27 | 2 | -2/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fix type annotation | Lukas Reschke | 2015-04-27 | 2 | -2/+2 |
| |/ |
|
* | | Merge pull request #15411 from mmattel/fix_for_15375_better_message_text | Thomas Müller | 2015-04-27 | 1 | -0/+1 |
|\ \ |
|
| * | | Improve error messge text for app upgrade try (#15375) | Martin | 2015-04-22 | 1 | -0/+1 |
* | | | Make methods explicit public | Joas Schilling | 2015-04-27 | 1 | -6/+6 |
* | | | Make getDefaultModuleId public and get module protected | Joas Schilling | 2015-04-27 | 4 | -18/+11 |
* | | | Verify that the encryption module exists before setting it | Joas Schilling | 2015-04-27 | 1 | -6/+7 |
| |/
|/| |
|
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-27 | 2 | -0/+2 |
* | | Merge pull request #15834 from owncloud/make-temporary-file-really-unique | Lukas Reschke | 2015-04-25 | 1 | -38/+61 |
|\ \ |
|
| * | | Fix collision on temporary files + adjust permissions | Lukas Reschke | 2015-04-23 | 1 | -38/+61 |
* | | | Merge pull request #15683 from owncloud/block-legacy-clients | Lukas Reschke | 2015-04-24 | 1 | -0/+79 |
|\ \ \ |
|
| * | | | Catch not existing User-Agent header | Lukas Reschke | 2015-04-23 | 1 | -1/+5 |
| * | | | Use 403 instead a 50x response | Lukas Reschke | 2015-04-20 | 1 | -10/+9 |
| * | | | Block old legacy clients | Lukas Reschke | 2015-04-20 | 1 | -0/+76 |