summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6988 from owncloud/oc_api_fix_warinigsTom Needham2014-02-101-6/+12
|\ | | | | [ocs API] getData() always needs to return an array
| * getData() always needs to return an arrayBjoern Schiessle2014-02-071-6/+12
| |
* | Merge pull request #7131 from owncloud/issue/6269Thomas Müller2014-02-101-6/+6
|\ \ | | | | | | Change MySQL to MariaDB/MySQL in the frontend
| * | Change MySQL to MySQL/MariaDB in the frontendJoas Schilling2014-02-071-6/+6
| | | | | | | | | | | | Fix issue #6269
* | | Merge pull request #7066 from owncloud/check_svg_installedThomas Müller2014-02-104-4/+4
|\ \ \ | | | | | | | | properly check if pdf and svg modules are installed
| * | | properly check if pdf and svg modules are installedGeorg Ehrke2014-02-044-4/+4
| | | |
* | | | Merge pull request #7071 from jcfischer/masterThomas Müller2014-02-101-1/+2
|\ \ \ \ | | | | | | | | | | close statement in MimeType detection is executed [#7069]
| * | | | close statement in MimeType detection is executed [#7069]Jens-Christian Fischer2014-02-041-1/+2
| |/ / / | | | | | | | | | | | | | | | | close statement was never executed due to it being after a return statement.
* | | | Merge pull request #6247 from owncloud/memcached-multiple-serversAndreas Fischer2014-02-081-2/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers.
| * | | Readd support for memcached_server config variable.Andreas Fischer2014-01-101-1/+9
| | | |
| * | | Add support for multiple memcached servers.Andreas Fischer2014-01-101-2/+2
| | | |
* | | | Merge pull request #6997 from owncloud/fix_l10n_warningsThomas Müller2014-02-071-2/+2
|\ \ \ \ | | | | | | | | | | change order of issubdirectory() calls to avoid error messages for non-apps
| * | | | change order of issubdirectory() calls to avoid error messages for non-appsBjoern Schiessle2014-01-291-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6952 from MartialGeek/add_freebox_supportVincent Petry2014-02-062-1/+6
|\ \ \ \ | | | | | | | | | | New user agent added for the Freebox.
| * | | | The regexp of the Freebox user agent is now more strict.Martial Saunois2014-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | A new unit test has been added in consequence.
| * | | | New user agent added for the Freebox.Martial Saunois2014-01-262-1/+6
| | | | | | | | | | | | | | | | | | | | The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
* | | | | Merge pull request #6445 from owncloud/fix_5956Vincent Petry2014-02-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix issue with logging non utf8 chars
| * | | | | encode imagePath and fix documentation of loadFromFileGeorg Ehrke2014-01-111-2/+2
| | | | | |
| * | | | | fix issue with logging non utf8 charsGeorg Ehrke2013-12-161-1/+1
| | | | | |
* | | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-041-12/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change misleading message when file size exceeds upload limit
| * \ \ \ \ \ Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-3053-320/+731
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
| * | | | | | | Separate PHP upload limit and free spacePellaeon Lin2013-12-081-12/+28
| | | | | | | |
* | | | | | | | Merge pull request #6081 from owncloud/partfilewebdavfixVincent Petry2014-02-041-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow getting info or renaming part files through WebDAV
| * | | | | | | | Allow getting info or renaming part files through WebDAVVincent Petry2014-01-231-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/setupMorris Jobke2014-02-042-25/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move core setup code to controller class
| * | | | | | | | Remove unused functions from OC_HelperBart Visscher2014-01-311-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init_var and init_radio where only used in the installation template
| * | | | | | | | Merge branch 'master' into setupBart Visscher2014-01-31209-5169/+3590
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/setup.php
| * | | | | | | | Merge remote-tracking branch 'origin/master' into setupBart Visscher2013-10-021-2/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-045-28/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Memcache to the public api
| * | | | | | | | | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-241-1/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-2211-10/+42
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-157-35/+54
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/connection.php
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-0918-25/+148
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also update the OCP\IServerContainerRobin Appelman2014-01-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows apps to specify a prefix to use
| * | | | | | | | | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-063-2/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Use APCIterator for Memcache\APC::clear()Robin Appelman2014-01-062-26/+8
| | | | | | | | | | | |
| * | | | | | | | | | | expose memory cache in public apiRobin Appelman2014-01-061-0/+13
| | | | | | | | | | | |
* | | | | | | | | | | | add test for password remove methodBjoern Schiessle2014-02-041-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #7013 from owncloud/dont_write_passwords_to_logBjörn Schießle2014-02-032-6/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | wrap stat() call in a try/catch block
| * | | | | | | | | | | also load error handler if debugging is enabledBjoern Schiessle2014-02-031-3/+15
| | | | | | | | | | | |
| * | | | | | | | | | | remove passwords in URLs from all log messagesBjoern Schiessle2014-02-032-4/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* / | | | | | | | | | Mark an app as loaded before we start loading itRobin Appelman2014-01-311-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6903 from owncloud/fix-ms-office-iconsJan-Christoph Borchardt2014-01-292-62/+63
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Add/fix Microsoft Office file icons.
| * | | | | | | | | Add icons for mdb and accdb files.Andreas Fischer2014-01-232-0/+3
| | | | | | | | | |
| * | | | | | | | | Fix icons for xml,ppt,dot,dotx files.Andreas Fischer2014-01-232-0/+4
| | | | | | | | | |
| * | | | | | | | | Remove duplicate mimetypes while keeping previous behaviour.Andreas Fischer2014-01-231-5/+0
| | | | | | | | | |
| * | | | | | | | | Bring mimetype list into alphabetical order.Andreas Fischer2014-01-231-62/+61
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-272-3/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added exception logger plugin for sabre connector
| * | | | | | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-272-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.