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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	show change password form if key couldn't be decrypted	Bjoern Schiessle	2013-12-06	1	-1/+1
\| \|
* \|	add method to check if users private/public key exists	Bjoern Schiessle	2013-12-06	1	-4/+13
\| \|
* \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-12-04	2	-0/+2
\|/
*	Revert "Adjust files_encryption requirements to the new core requirement ↵	Morris Jobke	2013-12-04	1	-1/+8
\| \| \| \| \| \|	(PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-12-02	16	-3/+24
\|
*	Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).	Andreas Fischer	2013-11-29	1	-8/+1
\|
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-29	1	-1/+1
\|
*	loginname is not necessarily username	Arthur Schiwon	2013-11-28	1	-4/+5
\|
*	Merge pull request #6094 from owncloud/enc_fix_reshares	Vincent Petry	2013-11-28	1	-2/+2
\|\ \| \| \| \|	fix path reconstruction for reshares
\| *	fix path reconstruction for reshares	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \|
* \|	improve encryption message	Morris Jobke	2013-11-27	1	-1/+1
\| \|
* \|	some small js fixes	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \|
* \|	add spinner to the template so that it can be loaded in time	Bjoern Schiessle	2013-11-27	1	-1/+1
\| \|
* \|	switch to large spinner	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \|
* \|	switch from "name" attribute to "id"	Bjoern Schiessle	2013-11-27	1	-2/+2
\| \|
* \|	Merge branch 'master' into encryption_initial_enc_indicator	Bjoern Schiessle	2013-11-27	7	-101/+130
\|\\|
\| *	Merge branch 'master' into encryption_enable_public_upload	Bjoern Schiessle	2013-11-27	12	-44/+71
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php
\| \| *	Merge pull request #5976 from owncloud/encryption_work_with_public_gallery	Thomas Müller	2013-11-27	7	-93/+123
\| \| \|\ \| \| \| \| \| \| \| \|	Encryption work with public gallery
\| \| \| *	typo fixed	Bjoern Schiessle	2013-11-27	1	-1/+1
\| \| \| \|
\| \| \| *	some small changes according to the review comments	Bjoern Schiessle	2013-11-27	7	-18/+19
\| \| \| \|
\| \| \| *	Merge branch 'encryption_work_with_public_gallery' of ↵	Bjoern Schiessle	2013-11-25	3	-19/+48
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:owncloud/core into encryption_work_with_public_gallery
\| \| \| \| *	Merge branch 'master' into encryption_work_with_public_gallery	Thomas Mueller	2013-11-24	3	-19/+48
\| \| \| \| \|\
\| \| \| * \| \|	fix typo in comment	Bjoern Schiessle	2013-11-25	1	-1/+1
\| \| \| \|/ /
\| * \| \| \|	Merge branch 'encryption_work_with_public_gallery' into ↵	Bjoern Schiessle	2013-11-21	1	-4/+10
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	encryption_enable_public_upload
\| \| * \| \| \|	check HTTP Referer to check if we come from public.php or from a internal page.	Bjoern Schiessle	2013-11-21	1	-4/+10
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Necessary to detect public access also if a user is logged in.
\| * \| \| \|	Merge branch 'encryption_work_with_public_gallery' into ↵	Bjoern Schiessle	2013-11-21	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	encryption_enable_public_upload
\| \| * \| \|	fix getFileKey() call	Bjoern Schiessle	2013-11-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'encryption_work_with_public_gallery' into ↵	Bjoern Schiessle	2013-11-21	4	-13/+15
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	encryption_enable_public_upload
\| \| * \| \|	Merge branch 'master' into encryption_work_with_public_gallery	Bjoern Schiessle	2013-11-21	4	-13/+15
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/crypt.php
\| * \| \| \| \|	Merge branch 'encryption_work_with_public_gallery' into ↵	Bjoern Schiessle	2013-11-21	2	-29/+34
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	encryption_enable_public_upload Conflicts: apps/files_encryption/lib/stream.php
\| \| * \| \| \|	better distinction between userID and keyId	Bjoern Schiessle	2013-11-21	2	-28/+32
\| \| \| \| \| \|
\| * \| \| \| \|	public upload now also works with encryption enabled	Bjoern Schiessle	2013-11-21	5	-23/+20
\| \|/ / / /
\| * \| \| \|	adapt tests to the new code	Bjoern Schiessle	2013-11-20	1	-9/+13
\| \| \| \| \|
\| * \| \| \|	make sure that we always use the correct user id	Bjoern Schiessle	2013-11-20	3	-11/+21
\| \| \| \| \|
\| * \| \| \|	fix some getShareKey() and getFileKey() calls	Bjoern Schiessle	2013-11-20	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	[wip] make encryption work with public gallery sharing	Bjoern Schiessle	2013-11-20	5	-56/+65
\| \| \| \| \|
* \| \| \| \|	with the latest changes in master $this-userID is always the correct ID, so ↵	Bjoern Schiessle	2013-11-27	2	-25/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we no longer need the extra parameter
* \| \| \| \|	Merge branch 'master' into encryption_initial_enc_indicator	Bjoern Schiessle	2013-11-26	2	-0/+2
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-26	1	-0/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	added a small version of the dark loading gif, looks nicer on the blue ↵	Bjoern Schiessle	2013-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	background
* \| \| \|	use POST instead of GET	Bjoern Schiessle	2013-11-26	2	-3/+3
\| \| \| \|
* \| \| \|	fix typo in var name	Bjoern Schiessle	2013-11-26	1	-1/+1
\| \| \| \|
* \| \| \|	remove debug output	Bjoern Schiessle	2013-11-25	1	-1/+0
\| \| \| \|
* \| \| \|	show a message at the log-in screen if inital encryption take place	Bjoern Schiessle	2013-11-25	4	-6/+70
\|/ / /
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-24	1	-1/+10
\| \| \|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-11-21	3	-18/+38
\| \|/ \|/\|
* \|	Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset	Vincent Petry	2013-11-20	2	-1/+5
\|\ \ \| \| \| \| \| \|	Fix for extstorage + encryption where unencrypted size is not kept
\| * \|	Fix for extstorage + encryption where unencrypted size is not kept	Vincent Petry	2013-11-20	2	-1/+5
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Fix for external storage with encryption where the unencrypted size is first written in the DB, then set back to zero, causing performance issue because the file needs to be reopened every time to find out the unencrypted size (and potentially needs a full redownload)
* \|	check if it is a cached file or a version to resolve the correct path to the ↵	Bjoern Schiessle	2013-11-20	1	-1/+5
\| \| \| \| \| \| \| \|	file key