Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg | Jan-Christoph Borchardt | 2014-02-04 | 1 | -0/+19 |
|\ | | | | | Change misleading message when file size exceeds upload limit | ||||
| * | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 7 | -24/+114 |
| |\ | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php | ||||
| * | | Separate PHP upload limit and free space | Pellaeon Lin | 2013-12-08 | 1 | -0/+19 |
| | | | |||||
* | | | Merge pull request #6647 from owncloud/memcache-public | icewind1991 | 2014-02-04 | 2 | -0/+35 |
|\ \ \ | |_|/ |/| | | Add Memcache to the public api | ||||
| * | | Fix some phpdoc errors and rename interface | Robin Appelman | 2014-01-24 | 2 | -4/+6 |
| | | | |||||
| * | | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-22 | 2 | -6/+59 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-09 | 1 | -0/+9 |
| |\ \ \ | |||||
| * | | | | Use $server->getMemCacheFactory() in ldap connection | Robin Appelman | 2014-01-09 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Also update the OCP\IServerContainer | Robin Appelman | 2014-01-08 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | get the memorycache factory from OCP\Server instead of a cache instance | Robin Appelman | 2014-01-08 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | this allows apps to specify a prefix to use | ||||
| * | | | | Remove the static dependency on OC_Util from Memcache | Robin Appelman | 2014-01-06 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #6907 from owncloud/webdav-logexceptions | Thomas Müller | 2014-01-27 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Added exception logger plugin for sabre connector | ||||
| * | | | | | Added exception logger plugin for sabre connector | Vincent Petry | 2014-01-27 | 1 | -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 documentation | Jens-Christian Fischer | 2014-01-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Add 'mail_from_address' configuration | Jens-Christian Fischer | 2014-01-24 | 1 | -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-master | Thomas Müller | 2014-01-21 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 1 | -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 checkPasswordProtectedShare | Thomas Müller | 2014-01-21 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | in case no share is found for the given token we can return right away | Thomas Müller | 2014-01-21 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | adding password protection check to getShareByToken() | Thomas Müller | 2014-01-21 | 1 | -4/+32 |
|/ / / / | |||||
* | | | | Merge pull request #6644 from ben-denham/unshare-all-fix | Björn Schießle | 2014-01-16 | 1 | -1/+9 |
|\ \ \ \ | |_|/ / |/| | | | \OCP\Share::unshareAll() fix | ||||
| * | | | Unshare all will now delete all shares for the item, instead of only for a ↵ | ben-denham | 2014-01-06 | 1 | -1/+9 |
| |/ / | | | | | | | | | | single owner. | ||||
* | | | Merge pull request #6290 from owncloud/files-androidcontentdisposition | Thomas Müller | 2014-01-07 | 1 | -0/+9 |
|\ \ \ | |/ / |/| | | Files androidcontentdisposition | ||||
| * | | Moved content disposition code+workarounds to OCP\Response | Vincent Petry | 2013-12-10 | 1 | -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 statement | Thomas Müller | 2013-12-19 | 1 | -2/+2 |
| | | |||||
* | | kill MDB2 in PHPDoc | Thomas Müller | 2013-12-19 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes | Thomas Müller | 2013-12-18 | 1 | -0/+8 |
|\ \ | | | | | | | Fixed download file from URL error messages | ||||
| * | | Fixed download file from URL error messages | Vincent Petry | 2013-12-12 | 1 | -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-defaults | Frank Karlitschek | 2013-12-17 | 1 | -3/+12 |
|\ \ | | | | | | | Add default parameter to OC\AllConfig/OCP\IConfig's getValue's | ||||
| * | | Also add default to the \OCP\IConfig interface | Robin Appelman | 2013-12-16 | 1 | -3/+12 |
| | | | |||||
* | | | Do not use L10n when logging exceptions | Vincent Petry | 2013-12-16 | 1 | -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 yet | Robin Appelman | 2013-12-13 | 1 | -2/+6 |
| | | |||||
* | | rely only on php DateTime to parse the db datetime string | Jörn Friedrich Dreyer | 2013-12-13 | 1 | -3/+2 |
|/ | |||||
* | add a optional parameter to skip check for expired files, this is necessary ↵ | Bjoern Schiessle | 2013-12-05 | 1 | -14/+21 |
| | | | | to find out to whom a file was shared after it was expired. | ||||
* | Merge pull request #6052 from owncloud/datetime-doctrine | Thomas Müller | 2013-12-01 | 1 | -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 Fischer | 2013-11-26 | 1 | -1/+2 |
| | | |||||
| * | Use DateTime object instead of fixed format date string. | Andreas Fischer | 2013-11-26 | 1 | -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 Fischer | 2013-11-26 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #6077 from owncloud/fix-api-documentation | Frank Karlitschek | 2013-11-29 | 3 | -2/+31 |
|\ \ | | | | | | | API doc for contacts manager, server container and share | ||||
| * | | add comment from @DeepDiver | Morris Jobke | 2013-11-27 | 1 | -2/+1 |
| | | | |||||
| * | | API doc for contacts manager, server container and share | Morris Jobke | 2013-11-27 | 3 | -2/+32 |
| |/ | |||||
* | | Merge pull request #6027 from owncloud/public-api-restful-routing-oc6 | Morris Jobke | 2013-11-27 | 1 | -0/+23 |
|\ \ | |/ |/| | fix appframework routing | ||||
| * | adding documentation for registerRoutes() | Thomas Müller | 2013-11-25 | 1 | -1/+13 |
| | | |||||
| * | fix appframework routing | Thomas Müller | 2013-11-25 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #6034 from owncloud/fix-api-documentation | Owen Winkler | 2013-11-25 | 28 | -19/+187 |
|\ \ | |/ |/| | Fix api documentation | ||||
| * | fix some capital letters | Morris Jobke | 2013-11-25 | 5 | -5/+14 |
| | | |||||
| * | page level doc blocks and class descriptions | Morris Jobke | 2013-11-25 | 15 | -0/+95 |
| | | |||||
| * | AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes | Morris Jobke | 2013-11-25 | 7 | -4/+58 |
| | | |||||
| * | fix defaults.php doc | Morris Jobke | 2013-11-25 | 1 | -10/+18 |
| | | |||||
| * | fix db.php doc | Morris Jobke | 2013-11-25 | 1 | -0/+2 |
| | |