summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* Additional phpdocRobin Appelman2014-02-122-4/+27
* Remove internal methods from the public interfaceRobin Appelman2014-02-121-7/+1
* Merge branch 'master' into backgroundjob-publicRobin Appelman2014-02-121-0/+11
|\
| * Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-111-0/+11
| |\
| | * Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-061-0/+11
* | | Add the background job list to the public server containerRobin Appelman2014-02-114-7/+116
|/ /
* / replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-071-1/+1
|/
* Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-041-0/+19
|\
| * Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-307-24/+114
| |\
| * | Separate PHP upload limit and free spacePellaeon Lin2013-12-081-0/+19
* | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-042-0/+35
|\ \ \ | |_|/ |/| |
| * | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-242-4/+6
| * | Merge branch 'master' into memcache-publicRobin Appelman2014-01-222-6/+59
| |\ \
| * \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-091-0/+9
| |\ \ \
| * | | | Use $server->getMemCacheFactory() in ldap connectionRobin Appelman2014-01-091-0/+9
| * | | | Also update the OCP\IServerContainerRobin Appelman2014-01-081-3/+3
| * | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-081-0/+17
| * | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-061-0/+7
* | | | | Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-271-2/+6
|\ \ \ \ \
| * | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-271-2/+6
| | |_|/ / | |/| | |
* | | | | added function documentationJens-Christian Fischer2014-01-241-0/+4
* | | | | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
|/ / / /
* | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-211-1/+9
|\ \ \ \
| * | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-211-1/+9
* | | | | fixing comment + adding unit test for checkPasswordProtectedShareThomas Müller2014-01-211-1/+7
* | | | | in case no share is found for the given token we can return right awayThomas Müller2014-01-211-0/+3
* | | | | adding password protection check to getShareByToken()Thomas Müller2014-01-211-4/+32
|/ / / /
* | | | Merge pull request #6644 from ben-denham/unshare-all-fixBjörn Schießle2014-01-161-1/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Unshare all will now delete all shares for the item, instead of only for a si...ben-denham2014-01-061-1/+9
| |/ /
* | | Merge pull request #6290 from owncloud/files-androidcontentdispositionThomas Müller2014-01-071-0/+9
|\ \ \ | |/ / |/| |
| * | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-101-0/+9
| |/
* | fix return statementThomas Müller2013-12-191-2/+2
* | kill MDB2 in PHPDocThomas Müller2013-12-191-4/+4
* | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixesThomas Müller2013-12-181-0/+8
|\ \
| * | Fixed download file from URL error messagesVincent Petry2013-12-121-0/+8
| |/
* | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-171-3/+12
|\ \
| * | Also add default to the \OCP\IConfig interfaceRobin Appelman2013-12-161-3/+12
* | | Do not use L10n when logging exceptionsVincent Petry2013-12-161-2/+1
|/ /
* | dont try to register background jobs if we haven't upgraded yetRobin Appelman2013-12-131-2/+6
* | rely only on php DateTime to parse the db datetime stringJörn Friedrich Dreyer2013-12-131-3/+2
|/
* add a optional parameter to skip check for expired files, this is necessary t...Bjoern Schiessle2013-12-051-14/+21
* Merge pull request #6052 from owncloud/datetime-doctrineThomas Müller2013-12-011-3/+5
|\
| * Use the Doctrine to convert date string to DateTime object.Andreas Fischer2013-11-261-1/+2
| * Use DateTime object instead of fixed format date string.Andreas Fischer2013-11-261-2/+1
| * Use bindValue() instead of passing parameters in execute().Andreas Fischer2013-11-261-1/+3
* | Merge pull request #6077 from owncloud/fix-api-documentationFrank Karlitschek2013-11-293-2/+31
|\ \
| * | add comment from @DeepDiverMorris Jobke2013-11-271-2/+1
| * | API doc for contacts manager, server container and shareMorris Jobke2013-11-273-2/+32
| |/
* | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6Morris Jobke2013-11-271-0/+23
|\ \ | |/ |/|
| * adding documentation for registerRoutes()Thomas Müller2013-11-251-1/+13