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 #1524 from owncloud/fix_ldaps_tls_setting	blizzz	2013-02-07	2	-4/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Typo	Arthur Schiwon	2013-02-07	1	-1/+1
\| * \| \| \| \| \| \| \| \| \|	LDAP: better detect timeouts. do not try to reconnect. do not try to bind whe...	Arthur Schiwon	2013-02-06	1	-3/+10
\| * \| \| \| \| \| \| \| \| \|	LDAP: when ldaps and tls are configured, disable the latter one - they do not...	Arthur Schiwon	2013-02-06	1	-0/+5
\| * \| \| \| \| \| \| \| \| \|	LDAP: info string improved	Arthur Schiwon	2013-02-06	1	-1/+1
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1451 from eMerzh/fix_1065	Thomas Müller	2013-02-07	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add Redirect to getUrlContent fix #1065	Brice Maron	2013-02-04	1	-0/+3
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1518 from schiesbn/trash_layout_fix	blizzz	2013-02-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	add class hascontrols to trash bin file table	Björn Schießle	2013-02-07	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1522 from schiesbn/trash_bin_fix	Björn Schießle	2013-02-07	5	-9/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	remove debug output	Björn Schießle	2013-02-07	1	-1/+0
\| * \| \| \| \| \| \| \| \| \| \|	rename OCA_Trash to OCA\Files_Trashbin	Björn Schießle	2013-02-07	5	-7/+7
\| * \| \| \| \| \| \| \| \| \| \|	OCA_Versions is now known as OCA\Files_Versions	Björn Schießle	2013-02-07	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| / / / / /	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-07	339	-4724/+6613
\| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1500 from chriskoch/patch-1	Frank Karlitschek	2013-02-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Update lib/public/util.php	Christian Koch	2013-02-06	1	-2/+2
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1509 from owncloud/correct-public-contacts-tests	Lukas Reschke	2013-02-06	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Correct lib/public/contacts.php tests	Bart Visscher	2013-02-06	2	-6/+6
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1443 from owncloud/use-module-file-info-master	Lukas Reschke	2013-02-06	3	-1/+23
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	we get best results regarding mime type detection if we use fileinfo - let's ...	Thomas Mueller	2013-02-04	3	-1/+23
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1506 from owncloud/files_encryption	Lukas Reschke	2013-02-06	6	-42/+32
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Reverted fix temporarily; another fix by LukasReschke is awaiting merge	Sam Tuke	2013-02-06	1	-1/+3
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-02-06	15	-24/+497
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Added comment	Sam Tuke	2013-02-06	2	-1/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Removed debugging code	Sam Tuke	2013-02-06	2	-2/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Added comments	Sam Tuke	2013-02-06	1	-7/+15
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixed bug causing password change related hooks to not be called due to ajax	Sam Tuke	2013-02-06	1	-0/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Fixed syntax bug	Sam Tuke	2013-02-06	1	-2/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-02-06	5	-6/+20
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Removed call to depreciated isUserVerified()	Sam Tuke	2013-02-06	1	-3/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-02-06	168	-2697/+1390
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Development snapshot	Sam Tuke	2013-02-06	3	-21/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed bug causing encrypted files to be doubly encrypted at login	Sam Tuke	2013-02-06	3	-14/+9
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1498 from schiesbn/delete_trash	Lukas Reschke	2013-02-06	5	-0/+91
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	copy&paste bug, no fetchAll() needed here	Björn Schießle	2013-02-06	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	delete debug code	Björn Schießle	2013-02-06	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	allow to delete single files from the trash bin permanently	Björn Schießle	2013-02-06	5	-0/+91
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1363 from owncloud/FixPasswordChange	Lukas Reschke	2013-02-06	1	-8/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix indentation	Lukas Reschke	2013-01-30	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the no longer existing function "isUserVerified"	Lukas Reschke	2013-01-30	1	-7/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1502 from owncloud/gitignore-cloud9	Thomas Müller	2013-02-06	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitignore Cloud9IDE system folder	Jan-Christoph Borchardt	2013-02-06	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1501 from owncloud/fix-shorttag	Jan-Christoph Borchardt	2013-02-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix shorttag issue mentioned in #1357	Jan-Christoph Borchardt	2013-02-06	1	-2/+2
\|/ / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1472 from owncloud/files_versions-cleanup	Thomas Müller	2013-02-06	6	-12/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only calculate md5 of local file once	Bart Visscher	2013-02-05	1	-1/+2
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change files_versions namespace to OCA\Files_Versions	Bart Visscher	2013-02-05	6	-11/+11
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1438 from owncloud/phpunit-tests-win32-master	Frank Karlitschek	2013-02-06	2	-0/+464
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPUnit support for Windows added	Thomas Mueller	2013-02-04	2	-0/+464
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1459 from owncloud/infield-detail	Jan-Christoph Borchardt	2013-02-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|