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

	Commit message (Expand)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-12	26	-26/+16
*	Merge pull request #16213 from cmeh/patch-5	Morris Jobke	2015-05-11	1	-2/+1
\|\
\| *	Grammar, removal of line break	Christian Hoffmann	2015-05-09	1	-2/+1
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-11	4	-0/+18
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-10	16	-6/+82
\|/
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-09	88	-446/+82
*	improved admin settings	Bjoern Schiessle	2015-05-08	3	-63/+90
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-08	4	-4/+16
*	Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page	Morris Jobke	2015-05-07	3	-7/+5
\|\
\| *	Display the module settings in the list of the encryption modules	Joas Schilling	2015-05-04	3	-7/+5
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-07	6	-2/+36
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-06	20	-10/+114
* \|	Merge pull request #15938 from owncloud/enc_update_recovery_share_key	Björn Schießle	2015-05-05	8	-44/+92
\|\ \
\| * \|	check recovery setting for the right user	Bjoern Schiessle	2015-04-30	8	-44/+92
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-05	98	-368/+306
* \| \|	Merge pull request #16026 from owncloud/enc_ux_improvements	Björn Schießle	2015-05-04	1	-3/+7
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	some small ux improvements	Bjoern Schiessle	2015-05-04	1	-3/+7
* \| \|	Merge pull request #15752 from owncloud/feature/fix-encryption-return-values	Thomas Müller	2015-05-04	4	-93/+299
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	change error codes to 400	Clark Tomlinson	2015-04-24	2	-20/+20
\| * \|	fix messages from settings crontroller	Clark Tomlinson	2015-04-22	2	-14/+15
\| * \|	remove status's and adjust js	Clark Tomlinson	2015-04-22	3	-67/+88
\| * \|	destupify tests	Clark Tomlinson	2015-04-22	2	-104/+100
\| * \|	fixing return values and adding tests	Clark Tomlinson	2015-04-22	2	-32/+220
* \| \|	Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder	Thomas Müller	2015-05-04	4	-3/+83
\|\ \ \
\| * \| \|	Simplify the test	Joas Schilling	2015-04-30	3	-14/+8
\| * \| \|	skip user if we don't have a public key	Bjoern Schiessle	2015-04-30	3	-1/+87
\| \| \|/ \| \|/\|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-04	2	-2/+2
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-05-02	2	-8/+8
\|/ /
* \|	Merge pull request #15919 from owncloud/enc_handle_empty_files	Clark Tomlinson	2015-04-29	4	-34/+118
\|\ \
\| * \|	method shouldn't be static	Bjoern Schiessle	2015-04-28	1	-1/+1
\| * \|	also create encryption keys for empty files	Bjoern Schiessle	2015-04-28	2	-23/+42
\| * \|	skip update of encryption keys if file is not encrypted	Bjoern Schiessle	2015-04-28	3	-13/+78
* \| \|	Merge pull request #15911 from owncloud/enc_create_header_for_new_key	Björn Schießle	2015-04-29	2	-3/+14
\|\ \ \
\| * \| \|	make sure that we create a header for the encrypted private key	Bjoern Schiessle	2015-04-28	2	-3/+14
\| \|/ /
* \| \|	Merge pull request #15706 from owncloud/fix-15705-master	Lukas Reschke	2015-04-29	2	-3/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	move creation of shared key to the login handler - fixes #15705	Thomas Müller	2015-04-17	2	-3/+6
* \| \|	fall back to the ownCloud default encryption module and aes128 if we read a e...	Bjoern Schiessle	2015-04-27	3	-3/+47
* \| \|	Only get encryption status when logged in	Vincent Petry	2015-04-23	1	-1/+1
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-23	2	-0/+6
\| \|/ \|/\|
* \|	add $encryptionModuleId to methods of Keys/IStorage	Thomas Müller	2015-04-22	3	-30/+44
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-22	88	-8/+280
* \|	Merge pull request #15713 from owncloud/fix-15707-master	Morris Jobke	2015-04-21	3	-35/+41
\|\ \
\| * \|	doc and indent	Thomas Müller	2015-04-21	2	-4/+8
\| * \|	Don't pollute the global namespace	Thomas Müller	2015-04-21	2	-29/+38
\| * \|	make jshint happy	Thomas Müller	2015-04-20	2	-14/+17
\| * \|	use a simple function - OC.Encryption is already defined - fixes #15707	Thomas Müller	2015-04-20	1	-23/+13
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-04-21	4	-8/+14
\|/ /
* \|	Merge pull request #15677 from owncloud/enc_reset_private_key_password	Thomas Müller	2015-04-20	5	-10/+379
\|\ \
\| * \|	Dont use the old .status way	Joas Schilling	2015-04-20	3	-24/+12
\| * \|	Fix several minor things	Joas Schilling	2015-04-20	2	-24/+21