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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-04-21	24	-121/+160
\|
*	Merge pull request #7988 from owncloud/routing-cache-webroot	Andreas Fischer	2014-04-20	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep cached urls with different hostnames or baseurls seperate * owncloud/routing-cache-webroot: Sort parameters and cast to int add delimiter between host and baseurl Keep cached urls with different hostnames or baseurls seperate
\| *	Sort parameters and cast to int	Robin Appelman	2014-04-15	1	-1/+2
\| \|
\| *	add delimiter between host and baseurl	Robin Appelman	2014-04-07	1	-1/+1
\| \|
\| *	Merge branch 'master' into routing-cache-webroot	Robin Appelman	2014-04-07	551	-17796/+16340
\| \|\
\| * \|	Keep cached urls with different hostnames or baseurls seperate	Robin Appelman	2014-04-01	1	-1/+1
\| \| \|
* \| \|	Merge pull request #8203 from owncloud/correct-link	Andreas Fischer	2014-04-20	1	-3/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use direct link instead of JS * owncloud/correct-link: Link to previous directory Use direct link instead of JS
\| * \| \|	Link to previous directory	Lukas Reschke	2014-04-16	1	-2/+2
\| \| \| \|
\| * \| \|	Use direct link instead of JS	Lukas Reschke	2014-04-14	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to our CSP policy this link won’t work as it it considered as inline Javascript. This commit replaces the link with a static link to the files app. Reimplementation of #8067 - fixes #7742
* \| \| \|	Merge pull request #8169 from owncloud/change-to-show	Andreas Fischer	2014-04-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change from showHTML to show * owncloud/change-to-show: Change from showHTML to show
\| * \| \| \|	Change from showHTML to show	Lukas Reschke	2014-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no need to use `showHTML` here.
* \| \| \| \|	Merge pull request #8277 from owncloud/add-type-hints	Andreas Fischer	2014-04-20	1	-11/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add type hinting * owncloud/add-type-hints: Add type hinting
\| * \| \| \| \|	Add type hinting	Lukas Reschke	2014-04-20	1	-11/+11
\| \| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-04-20	12	-12/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #8229 from owncloud/menutoggle-mobile	Lukas Reschke	2014-04-20	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	do not show menu toggle on public share links as there is no menu
\| * \| \| \| \|	do not show menu toggle on public share links as there is no menu	Jan-Christoph Borchardt	2014-04-16	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-04-19	22	-135/+144
\| \| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-04-18	12	-34/+34
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #8220 from owncloud/type-hinting-ldap	blizzz	2014-04-17	6	-4/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PHPdoc in user_ldap
\| * \| \| \| \| \|	Add missing param hint	Bart Visscher	2014-04-16	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix PHPdoc in user_ldap	Bart Visscher	2014-04-15	6	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using scrutinizer patch
* \| \| \| \| \| \|	Merge pull request #8249 from owncloud/correct-m	Morris Jobke	2014-04-17	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use JS as content-type due to mimesniffing
\| * \| \| \| \| \| \|	Use JS as content-type due to mimesniffing	Lukas Reschke	2014-04-17	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #8205 from owncloud/fix-8202	Morris Jobke	2014-04-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add one more LOWER.
\| * \| \| \| \| \| \| \|	remove unneeded LOWER. Fixes #8202	Victor Dubiniuk	2014-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #8222 from owncloud/type-hinting	Morris Jobke	2014-04-17	14	-18/+55
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Type hinting fixes
\| * \| \| \| \| \| \| \| \|	Fix PHPdoc in lib/public	Bart Visscher	2014-04-15	3	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using scrutinizer patch
\| * \| \| \| \| \| \| \| \|	Fix PHPdoc in lib/private	Bart Visscher	2014-04-15	11	-17/+42
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using scrutinizer patch
* \| \| \| \| \| \| \| \|	Merge pull request #8246 from Gared/master	Morris Jobke	2014-04-17	1	-19/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix javascript error in calendar app
\| * \| \| \| \| \| \| \| \|	Fix javascript error in calendar app	Stefan	2014-04-16	1	-19/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix owncloud/calendar#409 If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception. License: WTFPL
* \| \| \| \| \| \| \| \| \|	Merge pull request #8236 from owncloud/header-right-fix	Morris Jobke	2014-04-17	2	-36/+49
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove duplication of header and 'header-right' element, also ellipsize when too wide
\| * \| \| \| \| \| \| \| \| \|	fix header code duplication, code style fixes	Jan-Christoph Borchardt	2014-04-16	2	-21/+28
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	remove duplication of 'header-right' element, also make it overflow when too ↵	Jan-Christoph Borchardt	2014-04-16	2	-16/+22
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wide
* \| \| \| \| \| \| \| \| \|	Merge pull request #8189 from Xenopathic/misc_fixes	Robin McCorkell	2014-04-17	3	-16/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Various fixes
\| * \| \| \| \| \| \| \| \| \|	Fix user_ldap default setting value	Robin McCorkell	2014-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Prevent error from cache update on deleted files	Robin McCorkell	2014-04-13	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Prevent error in files_trashbin	Robin McCorkell	2014-04-13	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`glob` can return FALSE when the directory is empty, instead of an empty array, causing an error at `foreach`. "Note: On some systems it is impossible to distinguish between empty match and an error." See http://www.php.net/manual/en/function.glob.php -> Return Values
\| * \| \| \| \| \| \| \| \| \|	Adjust logic for deciding if trashbin empty	Robin McCorkell	2014-04-13	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Any error in opening the trashbin directory returns 'true' for isEmpty. An error is prevented by checking if the directory exists before trying to open it.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master	Jörn Friedrich Dreyer	2014-04-17	1	-7/+30
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \|	videos which are shorter then 5 seconds will now get a proper thumbnail ...
\| * \| \| \| \| \| \| \| \| \|	escape $second + update PHPDoc	Thomas Müller	2014-04-16	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	videos which are shorter then 5 seconds will now get a proper thumbnail at 1 ↵	Thomas Müller	2014-04-16	1	-7/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	second
* \| \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-04-17	18	-135/+180
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #8183 from owncloud/move-security-headers	Morris Jobke	2014-04-16	5	-33/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move security headers
\| * \| \| \| \| \| \| \| \| \| \|	Fix typo	Lukas Reschke	2014-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @DeepDiver1975
\| * \| \| \| \| \| \| \| \| \| \|	Typo + Line breaks	Lukas Reschke	2014-04-13	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove uneeded usages of nosniff	Lukas Reschke	2014-04-13	3	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix indentation	Lukas Reschke	2014-04-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Move security headers to base.php	Lukas Reschke	2014-04-13	2	-25/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #7994 from owncloud/fix-login-fields	Morris Jobke	2014-04-16	1	-15/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix login fields
\| * \| \| \| \| \| \| \| \| \| \|	fix overlapping infield labels	Jan-Christoph Borchardt	2014-04-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|