mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,409 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

10254 Commits

Author SHA1 Message Date
Lukas Reschke 20a6073a9f Migrate personal certificate handling into AppFramework controllers 
Also added unit-tests and better error-handling
 2015-04-20 12:58:58 +02:00
Morris Jobke 9cb260d310 Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage 
Fixing OCS API namespace usage
 2015-04-20 09:43:19 +02:00
Jenkins for ownCloud 75bf03a605 [tx-robot] updated from transifex 2015-04-20 01:54:44 -04:00
Thomas Müller fad76bd1b8 Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage 
LDAP - move from constants to class member constants
 2015-04-19 21:00:04 +02:00
Jenkins for ownCloud fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Thomas Müller cdf82909b8 Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules 
Issue/15694 display name of encryption modules
 2015-04-18 22:51:15 +02:00
Thomas Müller d2a31bcd93 Merge pull request #15727 from owncloud/cleanup-db-interface 
DB: remove unused parameter - was forgotten during the migration to doct...
 2015-04-18 22:47:40 +02:00
Morris Jobke e837927ad5 fix followup issues with unneeded parameters 2015-04-18 17:02:39 +02:00
Morris Jobke 58e5878b4d LDAP - move from constants to class member constants 
* fixes scrutinizer warnings
* drops the usage of deprecated code usage
 2015-04-18 15:29:08 +02:00
Morris Jobke 85d0fc5cf6 LDAP tests: swithc var_dump to exception 2015-04-18 15:09:15 +02:00
Joas Schilling 3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Joas Schilling 491e590165 Fix dummy encryption module registration 2015-04-18 10:20:32 +02:00
Jenkins for ownCloud 37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Arthur Schiwon fe237fd159 always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked 2015-04-17 23:33:59 +02:00
Thomas Müller ae681f0061 Revert "make jshint happy" 
This reverts commit a255866a93.
 2015-04-17 18:02:08 +02:00
Thomas Müller 0ca6398aa3 Revert "use a simple function - OC.Encryption is already defined - fixes #15707" 
This reverts commit c1a60a2349.
 2015-04-17 18:02:00 +02:00
Thomas Müller a255866a93 make jshint happy 2015-04-17 17:59:53 +02:00
Thomas Müller c1a60a2349 use a simple function - OC.Encryption is already defined - fixes #15707 2015-04-17 17:57:17 +02:00
Thomas Müller 2e803fd2cd Do not concat translation string 2015-04-17 14:26:58 +02:00
Thomas Müller d9f23c0578 fixing undefined variable 2015-04-17 14:25:57 +02:00
Thomas Müller 295839930a Merge pull request #15686 from owncloud/enc_fix_change_password 
fix change password if no user is logged in, occ call
 2015-04-17 14:14:29 +02:00
Bjoern Schiessle 195a48b2b8 fix change password if no user is logged in, occ call 2015-04-17 13:26:38 +02:00
Bjoern Schiessle 7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Jenkins for ownCloud da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Clark Tomlinson ac133e9faa Merge pull request #15675 from owncloud/enc_error_messages 
[encryption] display warning if password changed or if the keys are not initialized
 2015-04-16 09:45:09 -04:00
Clark Tomlinson 1174ad0681 Merge pull request #15445 from owncloud/enc2_migration 
add migration script from old encryption to new one
 2015-04-16 09:34:47 -04:00
Bjoern Schiessle e93f262eac display warning if password changed or if the keys are not initialized 2015-04-16 14:30:19 +02:00
Bjoern Schiessle 959665003b decrypt private key for public shares correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle 6bcf88ca96 fix decryption of legacy private key 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e7a4f4f3e4 add version 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Jenkins for ownCloud 8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Morris Jobke 8653da6c16 Merge pull request #15654 from owncloud/enc2_header_system_keys 
make sure that encrypted private keys always have a header
 2015-04-15 20:28:58 +02:00
Bjoern Schiessle 389a101de6 make sure that encrypted private keys always have a header 2015-04-15 19:52:48 +02:00
Morris Jobke 4a5c3eea42 Add visibility for method 2015-04-15 17:40:07 +02:00
Vincent Petry a6c5d65fd6 Fix SFTP storage id to be compatible with older ids 
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
 2015-04-15 16:25:47 +02:00
Thomas Müller 1a2475227b Merge pull request #15613 from owncloud/allow-files-nav-icons 
Allow files app nav entries to have a different icon class
 2015-04-15 11:18:58 +02:00
Jenkins for ownCloud 1a894bd0d8 [tx-robot] updated from transifex 2015-04-15 01:54:38 -04:00
Jenkins for ownCloud 7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Björn Schießle 4f0437fbde Merge pull request #15598 from owncloud/fix-enc-file-size-master 
Fix file size of encrypted files
 2015-04-14 16:48:04 +02:00
Morris Jobke c53a53f705 Allow files app nav entries to have a different icon class 2015-04-14 16:17:24 +02:00
Morris Jobke 82cab25762 Merge pull request #13360 from owncloud/cross-storage-move 
Proper copy/move between multiple local storages
 2015-04-14 14:35:08 +02:00
Thomas Müller cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Robin Appelman 0f21303b75 a bit more phpdoc 2015-04-14 12:35:53 +02:00
Thomas Müller f816acde27 fix reading of private key 2015-04-14 12:23:25 +02:00
Thomas Müller ffa115b517 Merge pull request #15566 from owncloud/fix-filepicker 
fix filepicker
 2015-04-14 00:39:12 +02:00
Robin Appelman f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman 8688660825 check that we know the parent 2015-04-13 17:10:02 +02:00
Robin Appelman 6b5daca7b7 check for source cache 2015-04-13 17:10:02 +02:00
Robin Appelman d4c91dc835 add missing return for shared 2015-04-13 15:13:03 +02:00