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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8398 from owncloud/enc_backup_keys	Björn Schießle	2014-05-13	9	-22/+176
\|\
\| *	backup the encryption key after the encryption was disabled so that the user	Bjoern Schiessle	2014-05-13	9	-22/+176
* \|	Merge pull request #8566 from owncloud/controller-defaults	Morris Jobke	2014-05-13	4	-13/+46
\|\ \
\| * \|	make it possible to omit parameters and use the default parameters from the c...	Bernhard Posselt	2014-05-13	4	-13/+46
* \| \|	Merge pull request #8562 from owncloud/better-addmountpoint	Vincent Petry	2014-05-13	1	-11/+25
\|\ \ \
\| * \| \|	Extract mount point merging logic into separate function	Robin McCorkell	2014-05-13	1	-11/+25
* \| \| \|	Merge pull request #8550 from owncloud/fix-sticky-footer	Morris Jobke	2014-05-13	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	fix sticky footer on log in page	Jan-Christoph Borchardt	2014-05-12	1	-2/+2
* \| \| \|	Merge pull request #8526 from owncloud/escape-share-emails-master	Vincent Petry	2014-05-13	1	-2/+2
\|\ \ \ \
\| * \| \| \|	fix style	Thomas Müller	2014-05-12	1	-2/+2
\| * \| \| \|	escape display name and email	Thomas Müller	2014-05-09	1	-1/+1
* \| \| \| \|	Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master	Vincent Petry	2014-05-13	1	-4/+5
\|\ \ \ \ \
\| * \| \| \| \|	Rotate thumbnail when encryption is enabled	Thomas Müller	2014-05-12	1	-4/+5
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-05-13	17	-94/+104
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #8556 from owncloud/kill-legacy-code-master	Thomas Müller	2014-05-12	36	-540/+102
\|\ \ \ \ \
\| * \| \| \| \|	remove legacy aka deprecated code: OC_Cache_FileGlobalGC	Thomas Müller	2014-05-12	1	-4/+0
\| * \| \| \| \|	remove legacy aka deprecated code: OC_FilesystemView	Thomas Müller	2014-05-12	28	-98/+89
\| * \| \| \| \|	remove legacy aka deprecated code: OC_Cache	Thomas Müller	2014-05-12	5	-17/+7
\| * \| \| \| \|	remove legacy aka deprecated code: OC_Filesystem	Thomas Müller	2014-05-12	5	-421/+6
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap	Lukas Reschke	2014-05-12	15	-386/+691
\|\ \ \ \ \
\| * \| \| \| \|	Use array as type	Lukas Reschke	2014-05-12	1	-1/+1
\| * \| \| \| \|	That's bool and not always true	Lukas Reschke	2014-05-11	1	-1/+1
\| * \| \| \| \|	Use WizardResult\|false instead of mixed	Lukas Reschke	2014-05-11	1	-2/+2
\| * \| \| \| \|	Use @return instead of @returns	Lukas Reschke	2014-05-11	3	-9/+9
\| * \| \| \| \|	Fix Typo	Lukas Reschke	2014-05-11	3	-3/+3
\| * \| \| \| \|	Use proper PHPDoc and variable names in the LDAP lib	Lukas Reschke	2014-05-11	12	-378/+683
* \| \| \| \| \|	Merge pull request #8553 from owncloud/fix-8549-master	Thomas Müller	2014-05-12	2	-29/+33
\|\ \ \ \ \ \
\| * \| \| \| \| \|	adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() ...	Thomas Müller	2014-05-12	2	-29/+33
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #8482 from owncloud/public-logger	Thomas Müller	2014-05-12	4	-13/+194
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	adding unit test for message interpolation	Thomas Müller	2014-05-12	1	-0/+40
\| * \| \| \| \|	fix missing spaces	Morris Jobke	2014-05-12	2	-3/+3
\| * \| \| \| \|	adding interpolation as requested by PSR-3	Thomas Müller	2014-05-12	1	-0/+9
\| * \| \| \| \|	- make logger available in the container	Bernhard Posselt	2014-05-09	3	-13/+145
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #8041 from owncloud/files-sortcolumns	Vincent Petry	2014-05-12	12	-74/+507
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Clear selection on reload (when changing sort)	Vincent Petry	2014-04-29	2	-2/+9
\| * \| \| \|	typos, indentation and remove of unused code	Thomas Müller	2014-04-28	3	-7/+7
\| * \| \| \|	html input tag has no closing tag	Thomas Müller	2014-04-28	1	-2/+3
\| * \| \| \|	$RUNTIME_APPTYPES is no longer used - left over from pre OC4	Thomas Müller	2014-04-28	1	-5/+0
\| * \| \| \|	Added unit test in files app for sort function in helper class	Vincent Petry	2014-04-28	2	-6/+113
\| * \| \| \|	Set default sort of trashbin to timestamp descending	Vincent Petry	2014-04-28	2	-4/+2
\| * \| \| \|	Add sorting to files list, trashbin and public files	Vincent Petry	2014-04-28	10	-57/+382
* \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-05-12	40	-218/+295
* \| \| \| \|	Merge pull request #8541 from owncloud/hardenIsSubDirectory	Morris Jobke	2014-05-12	4	-12/+24
\|\ \ \ \ \
\| * \| \| \| \|	Rename issubdirectory to isSubDirectory	Lukas Reschke	2014-05-11	4	-11/+11
\| * \| \| \| \|	Harden issubdirectory()	Lukas Reschke	2014-05-11	1	-1/+13
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #8540 from owncloud/fix-undefined	Morris Jobke	2014-05-12	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	$owner is not defined here	Lukas Reschke	2014-05-11	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #8477 from owncloud/better-controllers	Morris Jobke	2014-05-12	41	-177/+684
\|\ \ \ \ \
\| * \| \| \| \|	use new controllermethodreflector for corsmiddleware	Bernhard Posselt	2014-05-11	3	-11/+27
\| * \| \| \| \|	Fix typo	Bernhard Posselt	2014-05-11	1	-1/+1