summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-041-0/+19
|\ | | | | Change misleading message when file size exceeds upload limit
| * Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-307-24/+114
| |\ | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
| * | Separate PHP upload limit and free spacePellaeon Lin2013-12-081-0/+19
| | |
* | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-042-0/+35
|\ \ \ | |_|/ |/| | Add Memcache to the public api
| * | 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
| | | | | | | | | | | | | | | | | | | | this allows apps to specify a prefix to use
| * | | | 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 connector
| * | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-271-2/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs in the sabre connector code or code called by it, it will be logged. This plugin approach is needed because Sabre already catches exceptions to return them to the client in the XML response, so they don't appear logged in the web server log. This will make it much easier to debug syncing issues.
* | | | | added function documentationJens-Christian Fischer2014-01-241-0/+4
| | | | |
* | | | | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In environments where there are rules for the email addresses, the "from address" that owncloud uses has to be configurable. This patch adds a new configuration variable 'mail_from_address'. If it is configured, owncloud will use this as the sender of *all* emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by default). By using the 'mail_from_address' configuration, only this email address will be used.
* | | | 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 ↵Thomas Müller2014-01-211-1/+9
| | | | | | | | | | | | | | | | | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
* | | | | 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
|\ \ \ \ | |_|/ / |/| | | \OCP\Share::unshareAll() fix
| * | | Unshare all will now delete all shares for the item, instead of only for a ↵ben-denham2014-01-061-1/+9
| |/ / | | | | | | | | | single owner.
* | | Merge pull request #6290 from owncloud/files-androidcontentdispositionThomas Müller2014-01-071-0/+9
|\ \ \ | |/ / |/| | Files androidcontentdisposition
| * | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-101-0/+9
| |/ | | | | | | | | | | | | | | | | Added new OC\Response API called setContentDispositionHeader() that contains the needed workarounds for UTF8 and IE. Refactored download code to use the new API. Removed unused trashbin download file.
* | 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 messages
| * | Fixed download file from URL error messagesVincent Petry2013-12-121-0/+8
| |/ | | | | | | | | | | | | | | - L10N now converted to string to make them work with json_encode - Added specific error message when server doesn't allow fopen on URLs - Fixed client side to correctly show error message in a notification - Added OCP\JSON::encode() method to encode JSON with support for the OC_L10N_String values
* | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-171-3/+12
|\ \ | | | | | | Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
| * | 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
|/ / | | | | | | | | | | | | | | | | In some specific situations, the L10N bundle isn't loadable yet (for example when there is an issue with the app_config table). In such case, we still want to be able to log the real exception. This fixes errors that say "OC_L10N_String::__toString must not throw exceptions"
* | 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 ↵Bjoern Schiessle2013-12-051-14/+21
| | | | to find out to whom a file was shared after it was expired.
* Merge pull request #6052 from owncloud/datetime-doctrineThomas Müller2013-12-011-3/+5
|\ | | | | Get rid of date strings for DB. Completely use Doctrine and DateTime.
| * 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 a DateTime object and have conversion handled by Doctrine instead of using a date string with a fixed format.
| * 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
|\ \ | | | | | | API doc for contacts manager, server container and share
| * | 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
|\ \ | |/ |/| fix appframework routing
| * adding documentation for registerRoutes()Thomas Müller2013-11-251-1/+13
| |
| * fix appframework routingThomas Müller2013-11-251-0/+11
| |
* | Merge pull request #6034 from owncloud/fix-api-documentationOwen Winkler2013-11-2528-19/+187
|\ \ | |/ |/| Fix api documentation
| * fix some capital lettersMorris Jobke2013-11-255-5/+14
| |
| * page level doc blocks and class descriptionsMorris Jobke2013-11-2515-0/+95
| |
| * AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixesMorris Jobke2013-11-257-4/+58
| |
| * fix defaults.php docMorris Jobke2013-11-251-10/+18
| |
| * fix db.php docMorris Jobke2013-11-251-0/+2
| |