Commit graph

1374 commits

Author SHA1 Message Date
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Joas Schilling
26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Lukas Reschke
3566edbcec Merge pull request #12715 from owncloud/fix-broken-personal-page
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Joas Schilling
b85e34c1da Correctly namespace encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b Use self:: instead of the class name in encryption tests 2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90 Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself 2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f Fix namespace of files_encryption classes and autoload them 2014-12-09 09:47:26 +01:00
Morris Jobke
b9fab7441c remove duplicate loaded personal.js - fixes #12674 2014-12-09 09:27:10 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
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