Commit graph

1362 commits

Author SHA1 Message Date
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Bjoern Schiessle
1509dd1358 update error message 2014-12-04 12:01:11 +01:00
Bjoern Schiessle
0dd44eaf27 OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app 2014-12-04 11:17:44 +01:00
Bjoern Schiessle
0a173e2b58 fix typo 2014-12-03 19:46:32 +01:00
Bjoern Schiessle
9ca9acf3f8 small fixes 2014-12-02 16:08:06 +01:00
Bjoern Schiessle
2e78217f17 delete old keys if file was moved to a different mount point 2014-12-02 16:03:54 +01:00
Bjoern Schiessle
49cfc30359 upgrade to new folder structure 2014-12-02 16:03:54 +01:00
Bjoern Schiessle
a90606fb14 change private/public key names for consistency reasons 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
266f1a2afa harmonize copyright notice 2014-11-26 10:57:47 +01:00
Bjoern Schiessle
fd86d76f98 new folder structure for keys
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
Morris Jobke
c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Bjoern Schiessle
4643a5d238 replace \OC:: with \OC::->getSession() 2014-11-25 16:15:32 +01:00
Bjoern Schiessle
917bef39b7 don't store private public-share-key in session 2014-11-25 12:32:25 +01:00
Bjoern Schiessle
f274833403 remove unused variable 2014-11-25 10:12:10 +01:00
Bjoern Schiessle
1645c8f819 use login name to verify password 2014-11-24 15:44:43 +01:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Jenkins for ownCloud
f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Vincent Petry
391ece46e3 Fix file upload to ext storage when recovery key is enabled
Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Lukas Reschke
713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Volkan Gezer
995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Joas Schilling
76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Jenkins for ownCloud
91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Bjoern Schiessle
f6efbfcf0b listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user 2014-11-17 17:50:20 +01:00
Morris Jobke
146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Joas Schilling
b228226700 Fix single run of encryption tests and usages of uniqid() and fopen() 2014-11-17 10:48:13 +01:00
Joas Schilling
a3a064fe96 Skip some more tests on Windows which just can not work at all 2014-11-17 10:48:06 +01:00
Jenkins for ownCloud
9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Vincent Petry
5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05:00
Jenkins for ownCloud
1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Jenkins for ownCloud
664cc4ac0e [tx-robot] updated from transifex 2014-11-11 01:55:23 -05:00
Vincent Petry
676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Jenkins for ownCloud
c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud
46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Jenkins for ownCloud
da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Bjoern Schiessle
2af7256267 only set the values we need and make sure that we write the file info for both
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle
3d19bb2e51 also try to get file info from part file 2014-11-07 15:17:24 +01:00
Bjoern Schiessle
a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Lukas Reschke
e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Jenkins for ownCloud
7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Bjoern Schiessle
8104a4e24e check if the provided password is really the current log-in password 2014-11-06 11:12:20 +01:00
Bjoern Schiessle
c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Jenkins for ownCloud
c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Bjoern Schiessle
0580c232d7 still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue. 2014-11-04 17:16:36 +01:00
Vincent Petry
0f3e6cb50a Improved Javascript docs for JSDoc
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Lukas Reschke
e0528c7598 Merge pull request #11876 from owncloud/remove-pointless-requires
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
Vincent Petry
146c46b73a Merge pull request #11659 from jknockaert/master
rework getFileSize
2014-10-30 18:06:25 +01:00
Thomas Müller
f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00