Commit Graph

871 Commits

Author SHA1 Message Date
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Bjoern Schiessle b2dde14dbc coding style fixes 2013-09-06 16:07:18 +02:00
Bjoern Schiessle 93f4dec798 fix part file handling and real size calculation, this should also solve #4581
Conflicts:
	apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
Bjoern Schiessle f6830e7462 check shares for the real file and not for the .part file 2013-09-06 16:05:11 +02:00
Bjoern Schiessle 404e36323a first check if a extension exists before comparing it 2013-09-06 16:05:03 +02:00
Bjoern Schiessle 597a3cf1ad handle part files correctly 2013-09-06 16:04:56 +02:00
Bjoern Schiessle 1558cb860c remove test code 2013-09-06 13:16:48 +02:00
Bjoern Schiessle fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle 69b1625f0e re-added error.php 2013-09-06 12:27:25 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Bjoern Schiessle 4dbc787055 check if stream wrapper is already registered to avoid warning 2013-09-03 15:56:25 +02:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bjoern Schiessle 3d49631b8d make sure that initial encryption also starts for a fresh installation 2013-09-03 13:24:30 +02:00
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided.
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Bjoern Schiessle 88c4ac9b98 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-02 14:39:45 +02:00
Bjoern Schiessle 6572ca811f error.php no longer needed 2013-09-02 11:36:20 +02:00
Bjoern Schiessle 5e508f1ccb improved documentation of the methods 2013-09-02 11:34:28 +02:00
Bjoern Schiessle bab63c22ee encryption error messages, distinguish between a re-enabled encryption app and a password change from outside 2013-09-02 11:26:11 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle d7dca966a2 improved error messaging, initial commit 2013-08-30 10:17:50 +02:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 582b33bdf1 Merge pull request #4537 from owncloud/no-realpath
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
Andreas Fischer 83afb46205 Use __DIR__ instead of dirname(__FILE__).
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
Andreas Fischer 85ac9572ce Also remove other unnecessary realpath() calls. 2013-08-21 10:53:18 +02:00
Andreas Fischer 9753e44ac2 Do not use realpath() on includes.
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.

'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher eb97818519 Merge pull request #4483 from owncloud/compare-true-false
Compare result are already true/false
2013-08-18 03:26:35 -07:00
Bjoern Schiessle 1be11bb03d don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again 2013-08-18 11:21:01 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Björn Schießle d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up
crypt.php clean up
2013-08-17 04:10:15 -07:00
Bart Visscher 29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Bjoern Schiessle 7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
2013-08-14 21:20:53 +02:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
Bjoern Schiessle 7b1067c2a0 change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal 2013-08-12 16:19:08 +02:00
Bjoern Schiessle 0bab8935c9 preserve mtime if file gets encrypted/decrypted 2013-08-12 14:30:43 +02:00
Bjoern Schiessle b982868c14 fix array declaration 2013-08-12 13:59:49 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Bjoern Schiessle 44d201a526 Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up 2013-08-09 15:57:07 +02:00
Bjoern Schiessle 5ba8d38b7f remove old comments, TODos, etc. 2013-08-09 15:55:17 +02:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Thomas Müller c458e785a1 fixing typos and PHPDoc 2013-08-08 15:08:58 +02:00
Bjoern Schiessle 512f98cac9 remove todo item 2013-08-08 13:38:15 +02:00
Bjoern Schiessle 023121aed0 adapt tests to the changes in crypt.php 2013-08-08 13:35:01 +02:00
Bjoern Schiessle b39d2d1938 more error messages which might be useful for the user to debug his server config 2013-08-08 08:39:11 +02:00
Bjoern Schiessle 7ce03ba37c improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-08 08:39:01 +02:00
Bjoern Schiessle 7aeb0068be also write error message to the log 2013-08-08 08:38:52 +02:00
Bjoern Schiessle cfbdad9cdb catch broken server config and disable encryption app. 2013-08-08 08:38:37 +02:00
Bjoern Schiessle 97e910e087 make methods private which are not used from outside 2013-08-08 08:37:39 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud 0fce89308e [tx-robot] updated from transifex 2013-08-05 07:54:38 -04:00
Jenkins for ownCloud 9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Bjoern Schiessle 69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Bjoern Schiessle d7dd2ee465 don't know why it works locally but not on the build server... let's keep it out for the moment 2013-07-31 16:44:43 +02:00
Bjoern Schiessle 23e9721644 use OC\Files\View to read encrypted file, so that it also works with external storages 2013-07-31 16:35:14 +02:00
Bjoern Schiessle fe2937e3cd this hopefully fixes testRecoveryForUser(), works locally
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
2013-07-31 16:15:49 +02:00
Bjoern Schiessle 58233033c1 this test works locally, let's see what out build server says... 2013-07-31 12:03:50 +02:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Bjoern Schiessle 6c96a5273b fixing some unit tests 2013-07-30 18:21:23 +02:00
Bjoern Schiessle 2549322763 we need to use the path relative to data/ 2013-07-30 18:17:33 +02:00
Bjoern Schiessle a212c98125 handle error if we can't handle the given path 2013-07-30 15:27:59 +02:00
Bjoern Schiessle a6ced6b53f remove unused method, the right one is in util.php 2013-07-30 14:28:24 +02:00
Bjoern Schiessle aca7fbe2c8 adapt unit tests to the modified stream wrapper 2013-07-30 14:18:01 +02:00
Bjoern Schiessle 3640c99462 encrypt/decrypt file versions 2013-07-30 12:19:04 +02:00
Bjoern Schiessle ba18452eda only write keyfiles if it was a new file, otherwise nothing changed 2013-07-30 10:43:16 +02:00
Bjoern Schiessle 223d3c91d6 use path relative to data/ 2013-07-30 10:14:17 +02:00
Bjoern Schiessle a7a7ef2b3a improved error handling 2013-07-30 09:48:30 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Bjoern Schiessle b6fa0e4eef working decrypt files method 2013-07-29 17:06:05 +02:00
Björn Schießle e15e394fcc add ajax call to decrypt all files
Conflicts:
	apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
Björn Schießle 2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
	settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Thomas Müller 6e2418141d Merge branch 'master' into parallel-autotest.sh-master 2013-07-22 11:39:27 +02:00
Jenkins for ownCloud 01f3f8e0cc [tx-robot] updated from transifex 2013-07-22 02:03:23 -04:00
Morris Jobke f54f203e56 mark test as incomplete because I can't reproduce jenkins failure 2013-07-21 11:28:06 +02:00
Thomas Müller 20ee9945d1 don't rely on admin user but create a test user for Test_Encryption_Keymanager 2013-07-19 14:54:10 +02:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Jenkins for ownCloud 279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud 29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
Frank Karlitschek ccb3c5b428 Removed the preview warning. This is only a simple text change 2013-07-13 13:31:55 +02:00
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00