| 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 | -12/+28 |
| |\ | | | | | Change misleading message when file size exceeds upload limit | ||||
| | * | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 53 | -320/+731 |
| | |\ | | | | | | | | | | | | | | | | 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 | -12/+28 |
| | | | | |||||
| * | | | Merge pull request #6081 from owncloud/partfilewebdavfix | Vincent Petry | 2014-02-04 | 1 | -1/+14 |
| |\ \ \ | | | | | | | | | Allow getting info or renaming part files through WebDAV | ||||
| | * | | | Allow getting info or renaming part files through WebDAV | Vincent Petry | 2014-01-23 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mounting an ownCloud (backend OC) inside another ownCloud (frontend OC), the frontend OC will use WebDAV to upload file, which will create part files. These part files need to be accessible for the frontend OC to rename them to the actual file name. This fix leaves the file cache untouched but gives direct access to part file info when requested. This means that part file can be accessed only when their path and name are known. These won't appear in file listtings. Fixes #6068 | ||||
| * | | | | Merge pull request #4795 from owncloud/setup | Morris Jobke | 2014-02-04 | 2 | -25/+6 |
| |\ \ \ \ | | | | | | | | | | | Move core setup code to controller class | ||||
| | * | | | | Remove unused functions from OC_Helper | Bart Visscher | 2014-01-31 | 1 | -23/+0 |
| | | | | | | | | | | | | | | | | | | | | | init_var and init_radio where only used in the installation template | ||||
| | * | | | | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 209 | -5169/+3590 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: core/setup.php | ||||
| | * | | | | Merge remote-tracking branch 'origin/master' into setup | Bart Visscher | 2013-10-02 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #6647 from owncloud/memcache-public | icewind1991 | 2014-02-04 | 5 | -28/+38 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add Memcache to the public api | ||||
| | * | | | | | Fix some phpdoc errors and rename interface | Robin Appelman | 2014-01-24 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-22 | 11 | -10/+42 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-15 | 7 | -35/+54 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/connection.php | ||||
| | * \ \ \ \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-09 | 18 | -25/+148 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Also update the OCP\IServerContainer | Robin Appelman | 2014-01-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | get the memorycache factory from OCP\Server instead of a cache instance | Robin Appelman | 2014-01-08 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows apps to specify a prefix to use | ||||
| | * | | | | | | | Remove the static dependency on OC_Util from Memcache | Robin Appelman | 2014-01-06 | 3 | -2/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Use APCIterator for Memcache\APC::clear() | Robin Appelman | 2014-01-06 | 2 | -26/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | expose memory cache in public api | Robin Appelman | 2014-01-06 | 1 | -0/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | add test for password remove method | Bjoern Schiessle | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #7013 from owncloud/dont_write_passwords_to_log | Björn Schießle | 2014-02-03 | 2 | -6/+26 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | wrap stat() call in a try/catch block | ||||
| | * | | | | | | | | also load error handler if debugging is enabled | Bjoern Schiessle | 2014-02-03 | 1 | -3/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | remove passwords in URLs from all log messages | Bjoern Schiessle | 2014-02-03 | 2 | -4/+12 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * / | | | | | | | Mark an app as loaded before we start loading it | Robin Appelman | 2014-01-31 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #6903 from owncloud/fix-ms-office-icons | Jan-Christoph Borchardt | 2014-01-29 | 2 | -62/+63 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add/fix Microsoft Office file icons. | ||||
| | * | | | | | | | Add icons for mdb and accdb files. | Andreas Fischer | 2014-01-23 | 2 | -0/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix icons for xml,ppt,dot,dotx files. | Andreas Fischer | 2014-01-23 | 2 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove duplicate mimetypes while keeping previous behaviour. | Andreas Fischer | 2014-01-23 | 1 | -5/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Bring mimetype list into alphabetical order. | Andreas Fischer | 2014-01-23 | 1 | -62/+61 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #6907 from owncloud/webdav-logexceptions | Thomas Müller | 2014-01-27 | 2 | -3/+53 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added exception logger plugin for sabre connector | ||||
| | * | | | | | | | Added exception logger plugin for sabre connector | Vincent Petry | 2014-01-27 | 2 | -3/+53 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * / / / / / / | Add check for apc.enabled option | Otto Sabart | 2014-01-24 | 1 | -0/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it's not possible to disable APC entirely and some of apc_functions are disabled. Only thing which is possible is to disable apc.enable option. | ||||
| * | | | | | | Merge pull request #6844 from owncloud/fix-css-loading-master | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "use getAppWebPath() in here as well" | ||||
| | * | | | | | | Revert "use getAppWebPath() in here as well" | Thomas Müller | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3. | ||||
| * | | | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-master | Thomas Müller | 2014-01-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | OC_Util::setupFS($user) will create a data dir for the given string - no ↵ | Thomas Müller | 2014-01-21 | 2 | -0/+18 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error | ||||
| * | | | | | | | Merge pull request #6820 from owncloud/phpunit-test-config | Thomas Müller | 2014-01-20 | 3 | -3/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Load a separate config (if present) when running unit tests | ||||
| | * | | | | | | | Load a separate config (if present) when running unit tests | Robin Appelman | 2014-01-17 | 3 | -3/+2 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 2 | -4/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix | Vincent Petry | 2014-01-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fixed quota wrapper to not wrap failed fopen streams | ||||
| | * | | | | | | Fixed quota wrapper to not wrap failed fopen streams | Vincent Petry | 2014-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832 | ||||
| * | | | | | | | Merge pull request #6676 from aseques/check_internet_proxy | Thomas Müller | 2014-01-19 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix internet detection to use OC_Util::getUrlContent | ||||
| | * | | | | | | Disabled internet checking as mentioned when in proxy mode | Joan | 2014-01-10 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps | Morris Jobke | 2014-01-18 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix activation of unknown apps | ||||
| | * | | | | | | | error handling in case a requested app doesn't exists | Thomas Müller | 2014-01-15 | 1 | -0/+3 |
| | | |/ / / / / | |/| | | | | | |||||
| * / | | | | | | show link to app documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #6744 from owncloud/fix_ocs_response_messages | Thomas Müller | 2014-01-15 | 1 | -20/+22 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | keep response message | ||||
| | * | | | | | | keep response message | Bjoern Schiessle | 2014-01-13 | 1 | -20/+22 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtime | Vincent Petry | 2014-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use storage_mtime when determining if we can reuse cached data while scanning | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |