summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15367 from owncloud/pre-setup-hookThomas Müller2015-04-022-32/+38
|\
| * setup mount manager before wrappersRobin Appelman2015-04-022-3/+5
| * setup storage wrappers before setting up the filesystemRobin Appelman2015-04-011-29/+33
* | Merge pull request #15346 from oparoz/split-image-providerMorris Jobke2015-04-027-13/+182
|\ \
| * | Split image provider in one sub-class per media typeOlivier Paroz2015-04-027-13/+182
* | | Merge pull request #15349 from oparoz/limit-bitmap-previews-2Morris Jobke2015-04-021-9/+70
|\ \ \
| * | | The bitmap preview class now takes maxX and maxY into considerationOlivier Paroz2015-04-011-9/+70
| |/ /
* | | Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-ap...Thomas Müller2015-04-022-5/+27
|\ \ \
| * | | Fix docs and line breaksJoas Schilling2015-04-021-1/+5
| * | | Correctly purge the cache when an app is disabled via cliJoas Schilling2015-04-012-5/+23
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-022-8/+8
* | | Deprecate functions that only call the urlgenerator anywayRoeland Jago Douma2015-04-012-0/+8
|/ /
* | More secure proposalPierre Jochem2015-04-011-1/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-014-2/+10
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-3112-10/+108
* Merge pull request #15169 from rullzer/fix_displayNamesInGroupMorris Jobke2015-03-301-1/+1
|\
| * When searching for displayname then search for displaynameRoeland Jago Douma2015-03-241-1/+1
* | Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcacheRobin McCorkell2015-03-302-38/+8
|\ \
| * | Add check for activated local memcacheLukas Reschke2015-03-282-38/+8
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3020-0/+48
|/ /
* | Merge pull request #15289 from owncloud/min-upload-limitVincent Petry2015-03-281-3/+7
|\ \
| * | Require minimum 1 MiB upload limitRobin McCorkell2015-03-271-3/+7
* | | Check for relative datadirectory pathRobin McCorkell2015-03-271-5/+11
|/ /
* | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"Vincent Petry2015-03-274-129/+6
* | Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-271-11/+48
|\ \
| * | Do not return shares for files outside "files"Vincent Petry2015-03-271-11/+48
* | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-275-9/+134
|\ \ \
| * | | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| * | | Deprecated \OCP\IAppConfig - add missing methods to IConfigMorris Jobke2015-03-174-6/+129
* | | | Merge pull request #15240 from owncloud/storage-wrapper-priorityThomas Müller2015-03-273-10/+20
|\ \ \ \
| * | | | add priority to storage wrappersRobin Appelman2015-03-263-10/+20
* | | | | Merge pull request #15265 from owncloud/enc2_fixesThomas Müller2015-03-275-6/+28
|\ \ \ \ \
| * | | | | add deleteAllFileKeys to public interface and add "uid" as parameter for theBjoern Schiessle2015-03-273-2/+11
| * | | | | fix check if a file is excluded from encryption or notBjoern Schiessle2015-03-272-4/+17
* | | | | | Merge pull request #15247 from owncloud/fix_group_share_master_backportMorris Jobke2015-03-271-4/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | also call generateTarget for group share to add the correct prefix if share_f...Bjoern Schiessle2015-03-261-4/+5
* | | | | | Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-271-0/+46
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-261-0/+46
* | | | | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us...Morris Jobke2015-03-271-0/+9
|\ \ \ \ \ \
| * | | | | | Add some generic default headers as well via PHPLukas Reschke2015-03-261-0/+9
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-27124-510/+12
* | | | | | | Filter potential dangerous characters in path nameLukas Reschke2015-03-261-0/+5
* | | | | | | Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-262-3/+10
|\ \ \ \ \ \ \
| * | | | | | | Make the method compatible with all types of extensionsOlivier Paroz2015-03-191-1/+4
| * | | | | | | Fix the office classOlivier Paroz2015-03-191-3/+7
| * | | | | | | Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
* | | | | | | | Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make sure mountOptions keep their data typeVincent Petry2015-03-261-1/+1
* | | | | | | | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-261-6/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix permission checks in Sabre connectorVincent Petry2015-03-191-6/+15