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 #1570 from owncloud/refactor_filelist_addFile_addDir	Thomas Müller	2013-02-09	1	-43/+88
\|\
\| *	extract common code	Jörn Friedrich Dreyer	2013-02-09	1	-43/+88
* \|	Merge pull request #1383 from owncloud/files_encryption-style-fixes	Sam Tuke	2013-02-09	10	-829/+685
\|\ \ \| \|/ \|/\|
\| *	cleanup - more to come after	Thomas Müller	2013-02-09	10	-568/+403
\| *	Merge branch 'master' into files_encryption-style-fixes	Sam Tuke	2013-02-09	178	-1054/+1197
\| \|\
\| * \	Merge branch 'master' into files_encryption-style-fixes	Sam Tuke	2013-02-05	17	-1410/+1716
\| \|\ \
\| * \ \	Merge branch 'master' into files_encryption-style-fixes	Sam Tuke	2013-02-05	291	-1535/+5149
\| \|\ \ \
\| * \| \| \|	Fixed todos: undefined vars and unreachable code	Sam Tuke	2013-02-05	3	-34/+33
\| * \| \| \|	first style fixes - @samtuke: I added some TODO regarding undefined variables...	Thomas Mueller	2013-01-30	2	-455/+485
* \| \| \| \|	Merge pull request #1565 from owncloud/fix_replacing	Jörn Friedrich Dreyer	2013-02-09	1	-3/+0
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	remove code properly	Georg Ehrke	2013-02-09	1	-3/+0
* \| \| \| \|	Merge pull request #1560 from owncloud/fix_replacing	Bernhard Posselt	2013-02-09	1	-2/+2
\|\\| \| \| \|
\| * \| \| \|	remove (comment out) old code to fix replacing of files	Georg Ehrke	2013-02-09	1	-2/+2
* \| \| \| \|	Merge pull request #1562 from schiesbn/fix_naming	Bernhard Posselt	2013-02-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	rename trash to trash bin	Björn Schießle	2013-02-09	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #1521 from schiesbn/label_fixed	Björn Schießle	2013-02-09	1	-4/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	don't call the delete button unshare, unshare operation no longer available	Björn Schießle	2013-02-07	1	-4/+1
* \| \| \| \|	Merge pull request #1550 from owncloud/fix-files-download-links	Jörn Friedrich Dreyer	2013-02-09	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix files router download links	Bart Visscher	2013-02-08	2	-2/+2
* \| \| \| \| \|	Merge pull request #1541 from owncloud/fixing-1540-master	Jörn Friedrich Dreyer	2013-02-09	2	-8/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove unused code	Thomas Müller	2013-02-08	1	-6/+0
\| * \| \| \| \| \|	remove undefined function FileList.finishDelete	Thomas Müller	2013-02-08	1	-2/+0
\| \|/ / / / /
* / / / / /	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-09	63	-34/+118
\|/ / / / /
* \| \| \| \|	Merge pull request #1534 from owncloud/files_l10n	Thomas Müller	2013-02-08	3	-6/+10
\|\ \ \ \ \
\| * \| \| \| \|	Files: explicitly define	Robin Appelman	2013-02-08	2	-0/+4
\| * \| \| \| \|	Files: rename 'space' to 'storage' in upload.php	Robin Appelman	2013-02-07	1	-1/+1
\| * \| \| \| \|	Files: add translation support back to move/rename	Robin Appelman	2013-02-07	2	-5/+5
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-02-08	62	-42/+101
* \| \| \| \| \|	Merge pull request #1507 from tripflex/master	Bart Visscher	2013-02-07	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove left float from actions div class	Myles McNamara	2013-02-06	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #1526 from owncloud/l10n-support-master	Lukas Reschke	2013-02-07	5	-11/+22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	l10n support enhanced in files_versions	Thomas Mueller	2013-02-07	1	-1/+1
\| * \| \| \| \| \|	l10n support enhanced in files_trashbin	Thomas Mueller	2013-02-07	2	-3/+6
\| * \| \| \| \| \|	l10n support enhanced in files_version	Thomas Mueller	2013-02-07	3	-8/+16
* \| \| \| \| \| \|	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 #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
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	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	11	-3/+47
* \| \| \| \| \|	Merge pull request #1506 from owncloud/files_encryption	Lukas Reschke	2013-02-06	4	-35/+14
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into files_encryption	Sam Tuke	2013-02-06	8	-17/+18
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Added comment	Sam Tuke	2013-02-06	1	-1/+1
\| * \| \| \| \| \|	Removed debugging code	Sam Tuke	2013-02-06	2	-2/+2
\| * \| \| \| \| \|	Merge branch 'master' into files_encryption	Sam Tuke	2013-02-06	60	-189/+79
\| \|\ \ \ \ \ \