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

10373 Commits

Author SHA1 Message Date
Joas Schilling eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Lukas Reschke 17fedc80da Merge pull request #15652 from oparoz/better-text-previews 
Show a text preview instead of a bitmap preview of text
 2015-05-04 11:44:51 +02:00
Thomas Müller 0f7b8dd338 Merge pull request #15752 from owncloud/feature/fix-encryption-return-values 
[enc2] fixing return values and adding tests
 2015-05-04 11:44:15 +02:00
Thomas Müller 7376ea9b26 Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder 
skip user if we don't have a public key
 2015-05-04 09:57:19 +02:00
Jenkins for ownCloud 7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Morris Jobke 7a3b74a8b9 Merge pull request #15486 from owncloud/versions-rollbackkeepfileid 
Keep fileid when restoring version, using stream copy
 2015-05-03 13:12:54 +02:00
Jenkins for ownCloud aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jenkins for ownCloud eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Vincent Petry 972e189605 Use moveFromStorage instead of streamCopy when restoring version 2015-04-30 16:15:18 +02:00
Vincent Petry 2228faaa39 Fix version rollback to keep fileid 2015-04-30 16:15:18 +02:00
Joas Schilling 4a6808a0f4 Simplify the test 2015-04-30 12:04:02 +02:00
Bjoern Schiessle 4ef9df8750 skip user if we don't have a public key 2015-04-30 12:04:02 +02:00
Thomas Müller 7795265d93 Moving encryption_dummy to the apps repo - fixes #15950 2015-04-30 10:51:51 +02:00
Jenkins for ownCloud ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Clark Tomlinson 4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files 
Encryption improve handling of empty and unencrypted files
 2015-04-29 19:32:02 -04:00
Vincent Petry 002d74f95a Merge pull request #15908 from owncloud/fix-replace-with-sed 
Replace `replace` with `sed` statement
 2015-04-29 12:28:23 +02:00
Morris Jobke 8c7db2536d Merge pull request #15596 from owncloud/issue/15589 
Correctly generate the feedback URL for remote share
 2015-04-29 10:52:43 +02:00
Morris Jobke 0ab16cb823 Replace `replace` with `sed` statement 2015-04-29 09:53:45 +02:00
Björn Schießle 6ebb021359 Merge pull request #15911 from owncloud/enc_create_header_for_new_key 
make sure that we create a header for the encrypted private key
 2015-04-29 09:43:54 +02:00
Lukas Reschke 3e06fd9342 Merge pull request #15706 from owncloud/fix-15705-master 
move creation of shared key to the login handler
 2015-04-29 09:36:34 +02:00
Thomas Müller 416ef1eb62 Merge pull request #15921 from cmeh/patch-4 
Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
 2015-04-29 09:28:27 +02:00
Jenkins for ownCloud 9db338df29 [tx-robot] updated from transifex 2015-04-29 01:54:45 -04:00
cmeh 5e3fe7fb06 Update wizardTabElementary.js 
Corrected "More then …" to "More than …".
 2015-04-28 22:11:24 +02:00
Bjoern Schiessle 29bcfb2fdb method shouldn't be static 2015-04-28 20:21:53 +02:00
Bjoern Schiessle d5cbb66b66 also create encryption keys for empty files 2015-04-28 20:21:53 +02:00
Bjoern Schiessle df428b76ac skip update of encryption keys if file is not encrypted 2015-04-28 20:21:53 +02:00
Joas Schilling b55ef51a27 Add tests for the correct share id on the call aswell 2015-04-28 14:56:13 +02:00
Joas Schilling 34181c3aef Correctly send Federate-Cloud Share Feedback against the remote share ID 2015-04-28 14:29:04 +02:00
Bjoern Schiessle 7d05f387fb make sure that we create a header for the encrypted private key 2015-04-28 13:00:09 +02:00
Joas Schilling 66dca76f72 check the called URL 2015-04-28 11:28:54 +02:00
Joas Schilling 8f7c64253e Correctly generate the feedback URL for remote share 
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
 2015-04-28 11:28:54 +02:00
Morris Jobke de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate 
Propagate etags across shared storages
 2015-04-28 10:58:50 +02:00
Thomas Müller 5fa5f46a88 Merge pull request #15773 from owncloud/fix-15766 
LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
 2015-04-28 10:46:23 +02:00
Jenkins for ownCloud 6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Vincent Petry 69f88b38c9 Fix file name validation in New menu 2015-04-27 16:31:18 +02:00
Robin Appelman 5304afbecb dont pass floats as timestamp to the changepropagator 2015-04-27 15:18:25 +02:00
Thomas Müller 678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption 
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
 2015-04-27 14:32:19 +02:00
Robin Appelman 0789a6433e safer teardown 2015-04-27 14:07:16 +02:00
Robin Appelman 32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00
Robin Appelman 83b8ac0d7b cleanup hooks 2015-04-27 14:07:16 +02:00
Robin Appelman 2e897f05b1 triger propagation for webdav uploads 
use post hooks for share etag propagator
 2015-04-27 14:07:16 +02:00
Robin Appelman dd9601ae8f fix merge 2015-04-27 14:07:16 +02:00
Robin Appelman 45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman f488624e5f minor fixes 2015-04-27 14:07:16 +02:00
Robin Appelman 526ea3fcba add rename hook for propagation 2015-04-27 14:07:16 +02:00
Robin Appelman 77fbb4125b propagate changes up reshares 2015-04-27 14:07:16 +02:00
Robin Appelman 8cb40f6043 Make sure the owner mountpoints are setup 2015-04-27 14:07:16 +02:00
Robin Appelman d5434c9c4e more propagation tests 2015-04-27 14:07:16 +02:00
Robin Appelman b5c62cdad6 remove duplicates from rebase 2015-04-27 14:07:15 +02:00
Robin Appelman 19486837b2 adjust test 2015-04-27 14:07:15 +02:00