summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Add proper versioning for doc URLLukas Reschke2015-05-021-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-022-4/+4
* Merge pull request #15937 from owncloud/file-lockingThomas Müller2015-05-0110-23/+588
|\
| * allow getting the path from the lockedexceptionRobin Appelman2015-04-302-2/+23
| * use trait for cas polyfill for xcacheRobin Appelman2015-04-301-24/+2
| * add memcache based shared/exclusive lockingRobin Appelman2015-04-303-0/+158
| * add compare and swap to memcacheRobin Appelman2015-04-307-2/+132
| * extends memcache with add, inc and decRobin Appelman2015-04-306-22/+300
* | Merge pull request #15964 from owncloud/fix-l10n-string-warnThomas Müller2015-04-301-2/+0
|\ \
| * | fix #15962Bernhard Posselt2015-04-301-2/+0
| |/
* / use the preSetup hook to ensure the encryption wrapper is applied correctlyRobin Appelman2015-04-301-1/+1
|/
* Merge pull request #15949 from owncloud/l10n-string-jsonThomas Müller2015-04-301-1/+9
|\
| * implement json serialize for l10n stringBernhard Posselt2015-04-291-1/+9
* | Merge pull request #15946 from owncloud/auto-controller-resolveThomas Müller2015-04-301-0/+11
|\ \
| * | add aliases to pascal case constructor paramters to make it possible to auto ...Bernhard Posselt2015-04-291-0/+11
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-04-306-16/+18
|/
* Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-291-6/+9
|\
| * Fix scrutinizer complains and return type docJoas Schilling2015-04-281-4/+6
| * Correctly remove the protocol before prepeding itJoas Schilling2015-04-281-0/+1
| * Correctly generate the feedback URL for remote shareJoas Schilling2015-04-281-2/+2
* | Merge pull request #15906 from rullzer/fix_15777Morris Jobke2015-04-291-1/+1
|\ \
| * | Password set via OCS API should not be double escapedRoeland Jago Douma2015-04-281-1/+1
* | | Filter potential dangerous filenames for avatarsLukas Reschke2015-04-282-4/+11
| |/ |/|
* | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-285-1/+37
|\ \
| * | triger propagation for webdav uploadsRobin Appelman2015-04-271-0/+1
| * | fix propagation when renaming a directly reshared folderRobin Appelman2015-04-271-0/+4
| * | propagate etags for all user of a shareRobin Appelman2015-04-271-0/+12
| * | Allow getting *all* share entries owned by a userRobin Appelman2015-04-271-0/+12
| * | Make the change propagator an emitterRobin Appelman2015-04-272-1/+8
* | | 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
* | | Fix return type of the getRootFolder() methodJoas Schilling2015-04-282-2/+2
|/ /
* | Merge pull request #15890 from owncloud/fix-helper-docsThomas Müller2015-04-271-4/+5
|\ \
| * | Fix several type(hint) errors in private/helper.phpJoas Schilling2015-04-271-4/+5
* | | Merge pull request #15886 from owncloud/fix-15848-masterThomas Müller2015-04-271-1/+4
|\ \ \
| * | | fixes #15848Thomas Müller2015-04-271-1/+4
| |/ /
* | | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-273-15/+38
|\ \ \ | |/ / |/| |
| * | fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-273-15/+38
* | | Merge pull request #15882 from owncloud/fix-type-annotationMorris Jobke2015-04-272-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix type annotationLukas Reschke2015-04-272-2/+2
| |/
* | 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)Martin2015-04-221-0/+1
* | | Make methods explicit publicJoas Schilling2015-04-271-6/+6
* | | Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-274-18/+11
* | | Verify that the encryption module exists before setting itJoas Schilling2015-04-271-6/+7
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-272-0/+2
* | Merge pull request #15834 from owncloud/make-temporary-file-really-uniqueLukas Reschke2015-04-251-38/+61
|\ \
| * | Fix collision on temporary files + adjust permissionsLukas Reschke2015-04-231-38/+61
* | | Merge pull request #15683 from owncloud/block-legacy-clientsLukas Reschke2015-04-241-0/+79
|\ \ \
| * | | Catch not existing User-Agent headerLukas Reschke2015-04-231-1/+5