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-11-03	12	-12/+12
\|
*	Merge pull request #11902 from unclejamal3000/master	Morris Jobke	2014-11-02	1	-1/+1
\|\ \| \| \| \|	Enhance question in DB migration script
\| *	Enhance question in DB migration script	unclejamal3000	2014-11-02	1	-1/+1
\| \|
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-02	16	-12/+16
\| \|
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-02	24	-16/+32
\|/
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-01	60	-30/+108
\|
*	Merge pull request #11894 from owncloud/fix-unreachable-code	Vincent Petry	2014-10-31	1	-4/+8
\|\ \| \| \| \|	fix odd behaviour
\| *	fix odd behaviour	Morris Jobke	2014-10-31	1	-4/+8
\|/
*	test files external amazon s3 storage id migration	Jörn Friedrich Dreyer	2014-10-31	1	-0/+117
\|
*	fix files_external storage id migration	Jörn Friedrich Dreyer	2014-10-31	1	-3/+20
\|
*	Merge pull request #11888 from owncloud/add-code-climeate	Lukas Reschke	2014-10-31	1	-1/+3
\|\ \| \| \| \|	Add CodeClimate indicator
\| *	Add CodeClimate indicator	Lukas Reschke	2014-10-31	1	-1/+3
\|/
*	Merge pull request #9044 from owncloud/add-missing-email-principal	Vincent Petry	2014-10-31	1	-0/+12
\|\ \| \| \| \|	adding missing email address for principal
\| *	adding missing email address for principal	libasys	2014-10-24	1	-0/+12
\| \| \| \| \| \| \| \| \| \|	* fix #8515 * add mail only if it exists
* \|	Merge pull request #11876 from owncloud/remove-pointless-requires	Lukas Reschke	2014-10-31	33	-128/+57
\|\ \ \| \| \| \| \| \|	remove unnecessary require calls - the ownCloud class loader is supposed...
\| * \|	remove unnecessary require calls - the ownCloud class loader is supposed to ↵	Thomas Müller	2014-10-30	33	-128/+57
\| \| \| \| \| \| \| \| \| \| \| \|	take care of this
* \| \|	Merge pull request #11539 from owncloud/mount-setup-once	Vincent Petry	2014-10-31	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Only mount the storages for the user once
\| * \| \|	Reset the users setup after clearing mounts	Robin Appelman	2014-10-28	1	-0/+1
\| \| \| \|
\| * \| \|	Only mount the storages for the user once	Robin Appelman	2014-10-27	1	-1/+5
\| \| \| \|
* \| \| \|	Merge pull request #11850 from owncloud/fix-11848	Vincent Petry	2014-10-31	2	-14/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	on xp'ed mode and switching configurations: save raw mode instead of tog...
\| * \| \| \|	on xp'ed mode and switching configurations: save raw mode instead of ↵	Arthur Schiwon	2014-10-29	2	-14/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
* \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-10-31	158	-858/+1000
\| \| \| \| \|
* \| \| \| \|	Merge pull request #11877 from owncloud/fix-11875-master	Morris Jobke	2014-10-30	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	prevent PHP notice
\| * \| \| \| \|	prevent PHP notice	Thomas Müller	2014-10-30	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #11080 from owncloud/addheader-text-2	Vincent Petry	2014-10-30	6	-39/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the addHeader tag attributes text methods to not ignore the text parameter
\| * \| \| \| \|	Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the ↵	Lukas Reschke	2014-10-28	6	-39/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$text parameter Also support closing tags with no text content given Conflicts: lib/private/template.php
* \| \| \| \| \|	Merge pull request #11659 from jknockaert/master	Vincent Petry	2014-10-30	1	-38/+54
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rework getFileSize
\| * \| \| \| \| \|	initialisation of cipher	jknockaert	2014-10-28	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	small fix	jknockaert	2014-10-20	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	bugfixes	jknockaert	2014-10-20	1	-5/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	ok; still some bugs that had to be fixed	jknockaert	2014-10-20	1	-39/+35
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	small fix	jknockaert	2014-10-19	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rework getFileSize	jknockaert	2014-10-19	1	-28/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #11740 from owncloud/update-archive-tar	Thomas Müller	2014-10-30	2	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pear/archive_tar to 1.3.13
\| * \| \| \| \| \| \|	Update pear/archive_tar to 1.3.13	Thomas Müller	2014-10-30	2	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #11867 from owncloud/settings-sidebar-admin	Jan-Christoph Borchardt	2014-10-30	5	-111/+169
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduce sidebar for admin page
\| * \| \| \| \| \| \| \|	admin settings: fix LDAP settings header layout	Jan-Christoph Borchardt	2014-10-30	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix loading of more log entries	Thomas Müller	2014-10-30	4	-37/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixing ldap listing in admin sidebar - needs styling review	Thomas Müller	2014-10-30	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	introduce sidebar for admin page	Thomas Müller	2014-10-30	2	-74/+128
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #11864 from owncloud/clear-session-after-logout	Lukas Reschke	2014-10-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Clear session after logout
\| * \| \| \| \| \| \| \|	Clear session after logout	Lukas Reschke	2014-10-30	1	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/owncloud/core/issues/8420
* \| \| \| \| \| \| \|	Merge pull request #11858 from owncloud/fix-11064	Morris Jobke	2014-10-30	2	-2/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Allow any outgoing XHR connections
\| * \| \| \| \| \| \|	Allow any outgoing XHR connections	Lukas Reschke	2014-10-30	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quickfix for https://github.com/owncloud/core/issues/11064
* \| \| \| \| \| \| \|	Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro	Thomas Müller	2014-10-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stupid copy paste fail
\| * \| \| \| \| \| \| \|	Fix stupid copy paste fail	Lukas Reschke	2014-10-30	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	...
* \| \| \| \| \| \| \|	Merge pull request #11821 from owncloud/generic-response	Morris Jobke	2014-10-30	8	-29/+292
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a generic data response
\| * \| \| \| \| \| \| \|	add dataresponse	Bernhard Posselt	2014-10-29	8	-29/+292
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings
* \| \| \| \| \| \| \| \|	Merge pull request #11863 from owncloud/fix-enc-sharingtests	Morris Jobke	2014-10-30	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly register sharing hooks and proxies
\| * \| \| \| \| \| \| \| \|	Properly register sharing hooks and proxies	Vincent Petry	2014-10-30	1	-1/+7
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix failing tests when shares weren't cleant up on delete due to missing hooks. Added login for user1 in setUp().