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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-18	242	-198/+692
\|
*	Merge pull request #15714 from owncloud/fix-ldap-xpmode	Morris Jobke	2015-04-18	3	-2/+8
\|\ \| \| \| \|	always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
\| *	always open filter tab in raw mode, when 'Manually enter LDAP filters' is ↵	Arthur Schiwon	2015-04-17	3	-2/+8
\|/ \| \| \|	checked
*	Merge pull request #15691 from owncloud/vobject-sabre2.1	Morris Jobke	2015-04-17	1	-258/+0
\|\ \| \| \| \|	Get rid of the obsolete OC_VObject class
\| *	Get rid of the obsolete OC_VObject class	Vincent Petry	2015-04-17	1	-258/+0
\| \| \| \| \| \| \| \|	The class isn't needed any more since the update to Sabre 2.1
* \|	Merge pull request #15708 from owncloud/fix-capitalization	Morris Jobke	2015-04-17	2	-5/+5
\|\ \ \| \| \| \| \| \|	fix capitalization for server-side encryption and email server
\| * \|	fix capitalization for server-side encryption and email server, fix #15642	Jan-Christoph Borchardt	2015-04-17	2	-5/+5
\| \| \|
* \| \|	Revert "make jshint happy"	Thomas Müller	2015-04-17	2	-20/+17
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit a255866a937d906dbbe0ed46aa7394326b30e4f5.
* \| \|	Revert "use a simple function - OC.Encryption is already defined - fixes #15707"	Thomas Müller	2015-04-17	1	-13/+23
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c1a60a23498abe6502d207b8c803255e31515577.
* \| \|	make jshint happy	Thomas Müller	2015-04-17	2	-17/+20
\| \| \|
* \| \|	use a simple function - OC.Encryption is already defined - fixes #15707	Thomas Müller	2015-04-17	1	-23/+13
\| \| \|
* \| \|	Merge pull request #15699 from owncloud/fix-15696-master	Thomas Müller	2015-04-17	1	-11/+10
\|\ \ \ \| \| \| \| \| \| \| \|	Fix 15696 master
\| * \| \|	Do not concat translation string	Thomas Müller	2015-04-17	1	-5/+4
\| \| \| \|
\| * \| \|	fixing undefined variable	Thomas Müller	2015-04-17	1	-8/+8
\| \|/ /
* \| \|	Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps	Thomas Müller	2015-04-17	2	-19/+68
\|\ \ \ \| \|/ / \|/\| \|	Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
\| * \|	Delay initialization of the OC\Encryption\Update - introducing ↵	Thomas Müller	2015-04-17	2	-19/+68
\| \| \| \| \| \| \| \| \| \| \| \|	'OC\Encryption\HookManager'
* \| \|	Merge pull request #15686 from owncloud/enc_fix_change_password	Thomas Müller	2015-04-17	2	-5/+38
\|\ \ \ \| \|/ / \|/\| \|	fix change password if no user is logged in, occ call
\| * \|	fix change password if no user is logged in, occ call	Bjoern Schiessle	2015-04-17	2	-5/+38
\| \| \|
* \| \|	Merge pull request #15616 from owncloud/enc_stream_copy	Vincent Petry	2015-04-17	6	-60/+66
\|\ \ \ \| \|/ / \|/\| \|	always create a new instance of the encryption module
\| * \|	always create a new instance of the encryption module	Bjoern Schiessle	2015-04-17	6	-60/+66
\|/ /
* \|	Merge pull request #15679 from owncloud/fix-private-member-access	Thomas Müller	2015-04-17	1	-2/+2
\|\ \ \| \| \| \| \| \|	Fix private member access of parent class in ocsresponse
\| * \|	Fix private member access of parent class in ocsresponse	Morris Jobke	2015-04-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	* noticed while checking PHPDoc
* \| \|	Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace	Thomas Müller	2015-04-17	141	-152/+1373
\|\ \ \ \| \| \| \| \| \| \| \|	Add @since tags to all methods in public namespace
\| * \| \|	Add @since tags to all methods in public namespace	Morris Jobke	2015-04-16	141	-152/+1373
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* enhance the app development experience - you can look up the method introduction right inside the code without searching via git blame * easier to write apps for multiple versions
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-17	42	-68/+364
\| \|/ / \|/\| \|
* \| \|	Merge pull request #15675 from owncloud/enc_error_messages	Clark Tomlinson	2015-04-16	6	-10/+155
\|\ \ \ \| \| \| \| \| \| \| \|	[encryption] display warning if password changed or if the keys are not initialized
\| * \| \|	display warning if password changed or if the keys are not initialized	Bjoern Schiessle	2015-04-16	6	-10/+155
\| \| \| \|
* \| \| \|	Merge pull request #15445 from owncloud/enc2_migration	Clark Tomlinson	2015-04-16	29	-118/+1204
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	add migration script from old encryption to new one
\| * \| \| \|	decrypt private key for public shares correctly	Bjoern Schiessle	2015-04-16	3	-4/+4
\| \| \| \| \|
\| * \| \| \|	detect system wide mount points correctly	Bjoern Schiessle	2015-04-16	8	-24/+85
\| \| \| \| \|
\| * \| \| \|	if we start writing a file from the beginning, size should start by zero; ↵	Bjoern Schiessle	2015-04-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	result of floor needs to be casted to int in order to compare it with ->size
\| * \| \| \|	allow user to start migration in admin settings if no external user ↵	Bjoern Schiessle	2015-04-16	6	-18/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	back-ends are enabled
\| * \| \| \|	fix decryption of legacy private key	Bjoern Schiessle	2015-04-16	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	add version	Bjoern Schiessle	2015-04-16	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	add migration script from old encryption to new one	Bjoern Schiessle	2015-04-16	14	-73/+915
\| \| \| \| \|
* \| \| \| \|	Merge pull request #15674 from owncloud/fix-console-check-output	Joas Schilling	2015-04-16	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Convert error and hint to string before writing to the output
\| * \| \| \| \|	Convert error and hint to string before writing to the output - fixes ↵	Thomas Müller	2015-04-16	1	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
* \| \| \| \|	Merge pull request #15673 from owncloud/issue/15577-transaction-read-committed	Joas Schilling	2015-04-16	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	[master] Using TRANSACTION_READ_COMMITTED
\| * \| \| \|	Using TRANSACTION_READ_COMMITTED	Thomas Müller	2015-04-16	1	-0/+2
\| \|/ / /
* \| \| \|	Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master	Joas Schilling	2015-04-16	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	files_encryption -> encryption
\| * \| \|	files_encryption -> encryption	Thomas Müller	2015-04-16	1	-1/+1
\|/ / /
* \| \|	Merge pull request #15623 from t3chguy/master	Jörn Friedrich Dreyer	2015-04-16	2	-2/+8
\|\ \ \ \| \| \| \| \| \| \| \|	Redis DB Index via Select
\| * \| \|	Memcache\Redis Add DB Select Functionality	Michael Telatynski	2015-04-15	2	-2/+8
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-16	48	-16/+308
\| \| \| \|
* \| \| \|	8.1 alpha 1v8.1.0alpha1	Frank Karlitschek	2015-04-15	1	-2/+2
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #15654 from owncloud/enc2_header_system_keys	Morris Jobke	2015-04-15	2	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \|	make sure that encrypted private keys always have a header
\| * \| \|	make sure that encrypted private keys always have a header	Bjoern Schiessle	2015-04-15	2	-2/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #15644 from owncloud/sftp-defaultport-storageid	Morris Jobke	2015-04-15	2	-1/+66
\|\ \ \ \| \| \| \| \| \| \| \|	Fix SFTP storage id to be compatible with older ids
\| * \| \|	Add visibility for method	Morris Jobke	2015-04-15	1	-1/+1
\| \| \| \|
\| * \| \|	Fix SFTP storage id to be compatible with older ids	Vincent Petry	2015-04-15	2	-1/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove port from SFTP storage id if it is 22. This will prevent recreating a different storage entry due to id mismatch after upgrade.