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 branch 'master' into files_encryption_check_private_key	Björn Schießle	2013-06-13	583	-3299/+6073
\|\
\| *	Merge pull request #3552 from owncloud/files_encryption_upgrade_fix	Björn Schießle	2013-06-13	8	-99/+52
\| \|\
\| \| *	Merge branch 'master' into files_encryption_upgrade_fix	Björn Schießle	2013-06-13	163	-1726/+4352
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #3640 from infoneo/master	Thomas Müller	2013-06-13	2	-19/+31
\| \|\ \
\| \| * \|	Update mapper.php	infoneo	2013-06-08	1	-3/+15
\| \| * \|	Update mapper.php	infoneo	2013-06-08	1	-25/+8
\| \| * \|	Fixed problems with a dots in a filenames	infoneo	2013-05-12	1	-6/+12
\| \| * \|	Dots in a filenames fix	infoneo	2013-05-12	1	-8/+19
\| * \| \|	Merge pull request #3668 from owncloud/encryption_migrate_only_once	Björn Schießle	2013-06-13	3	-28/+74
\| \|\ \ \
\| \| * \| \|	add comment to explain the helper function	Björn Schießle	2013-06-13	1	-0/+8
\| \| * \| \|	fix typo in var name	Björn Schießle	2013-06-13	1	-1/+1
\| \| * \| \|	adapt test to the code changes	Björn Schießle	2013-06-12	1	-3/+18
\| \| * \| \|	use number of manipulated rows as idicator if it was possible to enter the mi...	Björn Schießle	2013-06-12	2	-69/+24
\| \| * \| \|	use constants for different migration status	Björn Schießle	2013-06-11	1	-8/+11
\| \| * \| \|	make sure that only one process can enter the migration mode	Björn Schießle	2013-06-11	2	-12/+77
\| * \| \| \|	Merge pull request #3677 from owncloud/apps-buttons	Jan-Christoph Borchardt	2013-06-13	2	-6/+17
\| \|\ \ \ \
\| \| * \| \| \|	apps management: change misleading + to ...	Jan-Christoph Borchardt	2013-06-12	1	-1/+1
\| \| * \| \| \|	remove App management top bar and move buttons more contextually in the inter...	Jan-Christoph Borchardt	2013-06-12	2	-6/+17
\| * \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-06-13	156	-1673/+4230
\| \| \| \| \| *	Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into ...	Björn Schießle	2013-06-13	1	-0/+0
\| \| \| \| \| \|\
\| \| \| \| \| \| *	update submodule	Florin Peter	2013-06-12	1	-0/+0
\| \| \| \| \| * \|	LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed	Björn Schießle	2013-06-13	1	-18/+0
\| \| \| \| \| \|/
\| \| \| \| \| *	Merge branch 'master' into files_encryption_upgrade_fix	Björn Schießle	2013-06-12	753	-4945/+8757
\| \| \| \| \| \|\ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #3679 from owncloud/multiselect-fixes	Thomas Tanghus	2013-06-12	2	-74/+95
\| \|\ \ \ \ \
\| \| * \| \| \| \|	multiselect: up min-width of group multiselect to 150px	Jan-Christoph Borchardt	2013-06-11	1	-1/+1
\| \| * \| \| \| \|	multiselect: fixed 'add group' interface a bit	Jan-Christoph Borchardt	2013-06-11	2	-4/+12
\| \| * \| \| \| \|	multiselect: more breathing space for entries	Jan-Christoph Borchardt	2013-06-11	1	-4/+13
\| \| * \| \| \| \|	multiselect: drop shadow for better focus	Jan-Christoph Borchardt	2013-06-11	1	-0/+3
\| \| * \| \| \| \|	multiselect: do not cut off group names	Jan-Christoph Borchardt	2013-06-11	1	-0/+1
\| \| * \| \| \| \|	checkstyle: add space after colon	Jan-Christoph Borchardt	2013-06-11	1	-46/+46
\| \| * \| \| \| \|	remove leading spaces	Jan-Christoph Borchardt	2013-06-11	1	-66/+66
\| * \| \| \| \| \|	Revert "FIX: Download of files named "true" or "false" impossible"	Roland Hager	2013-06-12	1	-2/+1
\| * \| \| \| \| \|	Merge pull request #3676 from owncloud/move-storage-bar	Frank Karlitschek	2013-06-12	1	-6/+9
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	move storage bar below clients showcase to make it more visible	Jan-Christoph Borchardt	2013-06-11	1	-6/+9
\| \| \|/ / / / /
\| * \| / / / /	FIX: Download of files named "true" or "false" impossible	Roland Hager	2013-06-12	1	-1/+2
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #3681 from owncloud/fix_ajax_removeuser.php	Morris Jobke	2013-06-12	1	-0/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	init language object before using it	Georg Ehrke	2013-06-12	1	-0/+1
\| * \| \| \| \| \|	Merge pull request #3654 from owncloud/clean_up_exceptions	Thomas Müller	2013-06-12	9	-179/+291
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	remove duplicate logging from db.php, now happens in entrypoints	Jörn Friedrich Dreyer	2013-06-10	1	-4/+0
\| \| * \| \| \| \| \|	clean up usage of DatabaseSetupException and catch Exceptions in entrypoints	Jörn Friedrich Dreyer	2013-06-10	7	-132/+171
\| \| * \| \| \| \| \|	introduce and use executeAudited in db.php	Jörn Friedrich Dreyer	2013-06-10	2	-47/+124
\| * \| \| \| \| \| \|	every test now has 15min to execute	Jörn Friedrich Dreyer	2013-06-12	1	-2/+2
\| * \| \| \| \| \| \|	Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload	Björn Schießle	2013-06-12	1	-0/+4
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	disable proxys during ssl root cert upload to avoid encryption	Björn Schießle	2013-06-12	1	-0/+4
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:owncloud/core	Björn Schießle	2013-06-12	536	-1464/+1475
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-06-12	536	-1464/+1475
\| * \| \| \| \| \| \| \|	backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f...	Björn Schießle	2013-06-12	1	-8/+11
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #3672 from owncloud/files-contrast	Jan-Christoph Borchardt	2013-06-11	4	-11/+45
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	feedback for hover/tap on breadcrumbs	Jan-Christoph Borchardt	2013-06-11	1	-0/+10
\| \| * \| \| \| \| \|	better contrast and grouping for blocks in personal settings through darker b...	Jan-Christoph Borchardt	2013-06-11	1	-2/+15