570 commits

Author	SHA1	Message	Date
Florin Peter	1202ab9995	Merge branch 'master' into file_encryption_external_storage_fixes	2013-05-29 19:19:40 +02:00
Florin Peter	d265264542	fix for share folder on external storage	2013-05-29 19:11:39 +02:00
Björn Schießle	b44192f366	check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages	2013-05-29 13:10:26 +02:00
Jenkins for ownCloud	7c0c6bd779	[tx-robot] updated from transifex	2013-05-29 02:10:54 +02:00
Florin Peter	71a532fc4d	fixed if fopen returns false typically on external storage	2013-05-28 20:50:14 +02:00
Florin Peter	4b4b447e2a	fixed missing convert to new session handler	2013-05-28 17:06:37 +02:00
Florin Peter	6ae7bde788	fixed encryption session namespace to avoid problems	2013-05-28 17:04:35 +02:00
Robin Appelman	cc0cf93136	merge master into sessionclass	2013-05-28 14:55:42 +02:00
Florin Peter	0041711fe3	fix for undefined index	2013-05-28 09:36:14 +02:00
Florin Peter	6f9e425939	fix for losing private key while being logged in and accessing a public link	2013-05-28 09:27:04 +02:00
Jenkins for ownCloud	3420d853ab	[tx-robot] updated from transifex	2013-05-28 02:07:51 +02:00
Robin Appelman	9c99048429	fix syntax error	2013-05-28 01:31:26 +02:00
Robin Appelman	44f9af5a7f	Use the new session wrapper	2013-05-28 01:04:09 +02:00
Björn Schießle	4c05259ccf	legacyBlockDecryprt() needs to be public	2013-05-27 17:35:38 +02:00
Björn Schießle	df22a7c495	make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes	2013-05-27 17:35:28 +02:00
Björn Schießle	8b35578833	fix migration from old to new encryption	2013-05-27 17:35:06 +02:00
Florin Peter	80433fc4c4	Merge branch 'master' into file_encryption_util_is_error ... Conflicts: apps/files_encryption/lib/util.php	2013-05-27 14:41:53 +02:00
Björn Schießle	5e243b48bb	Merge pull request #3481 from owncloud/firsttime_enc ... fix first time encryption after app was enabled	2013-05-27 05:17:31 -07:00
Florin Peter	8cf827ee9d	Merge branch 'master' into file_encryption_tests	2013-05-27 12:54:33 +02:00
Florin Peter	89f0c8f39d	added check by numRows() ... changed to public api where it was possible reformat code to comply with the coding guidelines	2013-05-27 12:41:55 +02:00
Jenkins for ownCloud	73e0b4c10a	[tx-robot] updated from transifex	2013-05-27 02:07:24 +02:00
Florin Peter	9dd277576a	added users for tests ... reformat code to meet coding guidelines	2013-05-26 20:44:15 +02:00
Florin Peter	c7981abbc9	improved test ... - fixed testPermanentDeleteFile sometimes failed - speed optimization - reformat code	2013-05-26 03:22:16 +02:00
Jenkins for ownCloud	0c621ff6a9	[tx-robot] updated from transifex	2013-05-26 02:03:54 +02:00
Florin Peter	788c5940f0	fixed error rising from fetchRow	2013-05-25 23:20:55 +02:00
Florin Peter	9a6cd89a69	added OC_DB::isError and logging	2013-05-25 21:33:05 +02:00
Frank Karlitschek	29c8cbf4d1	increase version and add warning	2013-05-25 12:08:18 +02:00
Jenkins for ownCloud	6a6c18dfab	[tx-robot] updated from transifex	2013-05-25 02:11:52 +02:00
Florin Peter	fba7200b05	improved trashbin test again	2013-05-24 23:12:16 +02:00
Florin Peter	b32823a96e	improved trashbin test	2013-05-24 23:12:07 +02:00
Björn Schießle	f56802a437	no use the recoveryPassword var instead of accessing the POST array	2013-05-24 18:37:58 +02:00
Björn Schießle	5ce4149e75	fix first time encryption after app was enabled	2013-05-24 17:35:00 +02:00
Florin Peter	6c8de5ae6d	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
Florin Peter	adc930d9f9	added l10n support in apps/files_encryption/ajax/adminrecovery.php	2013-05-23 22:09:28 +02:00
Björn Schießle	7b07168c46	code clean up; nicer solution to solve the public link share problem if a user is logged in	2013-05-23 21:18:31 +02:00
Björn Schießle	a9ebf2aabe	fix public link share if a user is logged in	2013-05-23 20:30:07 +02:00
Florin Peter	46c784ccdf	added trash bin tests	2013-05-22 23:51:35 +02:00
Björn Schießle	80dea1a8c5	settings clean-up; There is no blacklist in the new encryption app	2013-05-22 18:05:12 +02:00
Björn Schießle	15a3ae6db1	improved error messages	2013-05-22 18:01:18 +02:00
Florin Peter	c6722581f9	fix pgsql error	2013-05-22 02:02:42 +02:00
Florin Peter	afbfa742d7	improved tests	2013-05-22 01:11:55 +02:00
Florin Peter	9ca9a22c6a	fixed finding encrypted files in subfolders and removed unused code	2013-05-22 00:54:47 +02:00
Florin Peter	095fc790ac	added webdav test	2013-05-21 21:09:39 +02:00
Florin Peter	1deeec93b7	fixed postFileSize	2013-05-21 21:09:25 +02:00
Björn Schießle	9d324db054	fix path to 3rdparty apps	2013-05-21 12:33:32 +02:00
Björn Schießle	4c27c7e199	fix path, needs to be relative to data/	2013-05-21 12:22:03 +02:00
Björn Schießle	64591cf754	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
Florin Peter	c9e862ccba	fix broken tests	2013-05-21 07:19:23 +02:00
Florin Peter	4bf840e2ca	cleanup unused code optimize tests	2013-05-21 00:00:55 +02:00
Florin Peter	f2b1158add	improved tests	2013-05-20 23:44:10 +02:00