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 pull request #12009 from owncloud/make-optional	Morris Jobke	2014-11-06	1	-2/+2
\|\ \| \| \| \|	Make second argument optional
\| *	Make second argument optional	Lukas Reschke	2014-11-06	1	-2/+2
\| \| \| \| \| \| \| \|	Equivalent to addVendorScript und addScript from OC_Util
* \|	Merge pull request #11945 from owncloud/share-setup-other-user	Robin Appelman	2014-11-06	1	-3/+18
\|\ \ \| \|/ \|/\|	Setup shared mounts for the correct user when setting up the filesystem
\| *	Support displaynames for dummy user backend	Robin Appelman	2014-11-06	1	-3/+18
\| \|
* \|	Merge pull request #11998 from owncloud/add-get-logger-to-interface	Lukas Reschke	2014-11-06	1	-0/+7
\|\ \ \| \| \| \| \| \|	Add getLogger() to IServerContainer
\| * \|	Add getLogger() to IServerContainer	Lukas Reschke	2014-11-06	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Makes my IDE complaining less ;-)
* \| \|	Add OCP\Security\IHasher	Lukas Reschke	2014-11-06	4	-0/+220
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference. Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662 Requires https://github.com/owncloud/3rdparty/pull/136
* \| \|	Merge pull request #11883 from owncloud/clear-session-for-setup	Lukas Reschke	2014-11-06	1	-1/+2
\|\ \ \ \| \|_\|/ \|/\| \|	Clear session before setup
\| * \|	Clear session before setup	Lukas Reschke	2014-10-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/owncloud/core/issues/11861
* \| \|	Merge pull request #11972 from owncloud/usermanager-remove-delete	Lukas Reschke	2014-11-06	2	-22/+5
\|\ \ \ \| \|_\|/ \|/\| \|	Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
\| * \|	Remove confusingly names \OC\User\Manager::delete and fix the automatic ↵	Robin Appelman	2014-11-05	2	-22/+5
\| \| \| \| \| \| \| \| \| \| \| \|	cache cleanup instead
* \| \|	md5 now handled via bower	Morris Jobke	2014-11-06	1	-1/+1
\| \| \|
* \| \|	bower snapjs	Morris Jobke	2014-11-06	1	-1/+1
\| \| \|
* \| \|	Merge pull request #11982 from owncloud/bower-underscore	Vincent Petry	2014-11-06	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	bower underscore
\| * \| \|	bower underscore	Morris Jobke	2014-11-05	1	-1/+1
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-06	2	-0/+2
\|/ / /
* \| \|	Merge pull request #11936 from owncloud/bower-jquery	Lukas Reschke	2014-11-05	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Bower jquery
\| * \| \|	migrate jQuery to bower	Morris Jobke	2014-11-04	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #11965 from owncloud/fix-jsonresponse	Thomas Müller	2014-11-05	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix typo in content type for JSONResponse
\| * \| \| \|	fix typo in content type	Bernhard Posselt	2014-11-05	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #11928 from owncloud/support-HTML-in-logo	Thomas Müller	2014-11-05	2	-0/+20
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Support HTML in logo
\| * \| \|	Support HTML in logo claim	Lukas Reschke	2014-11-03	2	-0/+20
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-05	2	-0/+2
\| \| \| \|
* \| \| \|	fix shortcuts - underline instead of camelCase	Morris Jobke	2014-11-04	1	-2/+2
\| \|/ / \|/\| \|
* \| \|	Merge pull request #11916 from owncloud/introduce-bower	Morris Jobke	2014-11-04	3	-17/+75
\|\ \ \ \| \| \| \| \| \| \| \|	Introduce bower dependency managment for frontend libraries
\| * \| \|	replace moment.js with bower version	Morris Jobke	2014-11-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fix JS unit tests
\| * \| \|	ability to add bower resources	Morris Jobke	2014-11-03	2	-16/+74
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-11-04	2	-2/+2
\| \| \|
* \| \|	Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig	Morris Jobke	2014-11-03	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	First check whether it is the default config before touching
\| * \|	First check whether it is the default config before touchign	Lukas Reschke	2014-11-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Potentially fixes https://github.com/owncloud/core/issues/11678
* \| \|	Update Pimple to V3.0	Thomas Müller	2014-11-03	3	-15/+17
\| \| \|
* \| \|	Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5	Thomas Müller	2014-11-03	1	-2/+0
\|/ /
* \|	fix odd behaviour	Morris Jobke	2014-10-31	1	-4/+8
\| \|
* \|	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 #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
\| \| \|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-10-31	2	-2/+14
\| \| \|
* \| \|	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	3	-11/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	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	3	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$text parameter Also support closing tags with no text content given Conflicts: lib/private/template.php
* \| \| \| \|	Merge pull request #11740 from owncloud/update-archive-tar	Thomas Müller	2014-10-30	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update pear/archive_tar to 1.3.13
\| * \| \| \| \|	Update pear/archive_tar to 1.3.13	Thomas Müller	2014-10-30	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	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	1	-1/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Allow any outgoing XHR connections
\| * \| \| \| \|	Allow any outgoing XHR connections	Lukas Reschke	2014-10-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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