Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7156 from owncloud/backgroundjob-public | Thomas Müller | 2014-02-14 | 4 | -7/+133 |
|\ | | | | | Add the background job list to the public server container | ||||
| * | Additional phpdoc | Robin Appelman | 2014-02-12 | 2 | -4/+27 |
| | | |||||
| * | Remove internal methods from the public interface | Robin Appelman | 2014-02-12 | 1 | -7/+1 |
| | | |||||
| * | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 1 | -0/+11 |
| |\ | |||||
| * | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 4 | -7/+116 |
| | | | |||||
* | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -1/+139 |
|\ \ \ | | | | | | | | | Add a FileInfo class which holds all info of a file ... | ||||
| * \ \ | merge master into fileinfo | Robin Appelman | 2014-01-29 | 3 | -7/+61 |
| |\ \ \ | |||||
| * | | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 1 | -0/+28 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 1 | -1/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| * | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 1 | -15/+5 |
| | | | | | | |||||
| * | | | | | Extends phpdoc for \OCP\File\FileInfo | Robin Appelman | 2014-01-13 | 1 | -4/+37 |
| | | | | | | |||||
| * | | | | | Add a FileInfo class which holds all info of a file and return that from ↵ | Robin Appelman | 2014-01-13 | 2 | -1/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | getFileInfo, getDirectoryContent and search | ||||
* | | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfig | Thomas Müller | 2014-02-13 | 2 | -0/+98 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Convert OC_Appconfig to object interface | ||||
| * \ \ \ \ \ | Merge branch 'master' into convert-oc_appconfig | Robin Appelman | 2014-02-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | use the 'new' server container for appconfig | Robin Appelman | 2014-02-07 | 60 | -1128/+2709 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge pull request #6964 from owncloud/storagestatistics-reuse | icewind1991 | 2014-02-12 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | ||||
| * | | | | | | | Merge branch 'master' into storagestatistics-reuse | Robin Appelman | 2014-02-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 3 | -2/+60 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 1 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfile | Vincent Petry | 2014-02-11 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Added isLocal() method to storage, used for xsendfile | ||||
| * | | | | | | | Added isLocal() method to storage, used for xsendfile | Vincent Petry | 2014-02-06 | 1 | -0/+11 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isLocal() method to Storage to find out whether the storage is local or not. This method is used for the x-sendfile logic to find out whether to add the headers. | ||||
* / | | | | | | replace 'size' with 'unencrypted_size' if encryption is enabled | Bjoern Schiessle | 2014-02-07 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | 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 |