nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into quota-space-root	Robin Appelman	2014-02-07	23	-148/+304
\|\
\| *	Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files	Vincent Petry	2014-02-07	1	-1/+1
\| \|\ \| \| \| \| \| \|	replace 'size' with 'unencrypted_size' if encryption is enabled
\| \| *	replace 'size' with 'unencrypted_size' if encryption is enabled	Bjoern Schiessle	2014-02-07	1	-1/+1
\| \| \|
\| * \|	Merge pull request #6997 from owncloud/fix_l10n_warnings	Thomas Müller	2014-02-07	1	-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-apps	Bjoern Schiessle	2014-01-29	1	-2/+2
\| \| \|
\| * \|	Merge pull request #6952 from MartialGeek/add_freebox_support	Vincent Petry	2014-02-06	2	-1/+6
\| \|\ \ \| \| \| \| \| \| \| \|	New user agent added for the Freebox.
\| \| * \|	The regexp of the Freebox user agent is now more strict.	Martial Saunois	2014-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A new unit test has been added in consequence.
\| \| * \|	New user agent added for the Freebox.	Martial Saunois	2014-01-26	2	-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_5956	Vincent Petry	2014-02-06	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fix issue with logging non utf8 chars
\| \| * \| \|	encode imagePath and fix documentation of loadFromFile	Georg Ehrke	2014-01-11	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	fix issue with logging non utf8 chars	Georg Ehrke	2013-12-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg	Jan-Christoph Borchardt	2014-02-04	2	-12/+47
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change misleading message when file size exceeds upload limit
\| \| * \ \ \	Merge branch 'master' into pr-exceed_upload_limit_msg	Pellaeon Lin	2014-01-30	102	-518/+1141
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
\| \| * \| \| \| \|	Separate PHP upload limit and free space	Pellaeon Lin	2013-12-08	2	-12/+47
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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	3	-26/+8
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	280	-3205/+6752
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: core/setup.php
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into setup	Bart Visscher	2013-10-02	350	-1308/+8644
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into setup	Bart Visscher	2013-09-12	6	-28/+38
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/util.php
\| \| * \| \| \| \| \| \| \| \|	Check for failure in creating htaccessWorking testfile	Bart Visscher	2013-09-10	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Move core setup code to controller class	Bart Visscher	2013-09-10	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #6647 from owncloud/memcache-public	icewind1991	2014-02-04	7	-28/+73
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Memcache to the public api
\| \| * \| \| \| \| \| \| \| \| \|	Fix some phpdoc errors and rename interface	Robin Appelman	2014-01-24	3	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into memcache-public	Robin Appelman	2014-01-22	14	-18/+113
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into memcache-public	Robin Appelman	2014-01-15	9	-49/+56
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/user_ldap/lib/connection.php
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into memcache-public	Robin Appelman	2014-01-09	21	-27/+171
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use $server->getMemCacheFactory() in ldap connection	Robin Appelman	2014-01-09	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Also update the OCP\IServerContainer	Robin Appelman	2014-01-08	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	get the memorycache factory from OCP\Server instead of a cache instance	Robin Appelman	2014-01-08	2	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this allows apps to specify a prefix to use
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove the static dependency on OC_Util from Memcache	Robin Appelman	2014-01-06	4	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+28
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrap stat() call in a try/catch block
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	also load error handler if debugging is enabled	Bjoern Schiessle	2014-02-03	2	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+59
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added exception logger plugin for sabre connector
\| \| * \| \| \| \| \| \| \| \| \| \|	Added exception logger plugin for sabre connector	Vincent Petry	2014-01-27	3	-5/+59
\| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \| \|	Don't create new thumbnails on the write hook	Robin Appelman	2014-02-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Actually rename the variable	Robin Appelman	2014-01-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix phpdoc	Robin Appelman	2014-01-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Allow passing a root folder to get the used space from in the quota wrapper	Robin Appelman	2014-01-27	2	-2/+8
\|/ / / / / / / / / / /