Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-02 | 20 | -30/+36 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-01 | 14 | -4/+70 |
| | |||||
* | Moving encryption_dummy to the apps repo - fixes #15950 | Thomas Müller | 2015-04-30 | 5 | -218/+0 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 36 | -38/+16 |
| | |||||
* | Merge pull request #15919 from owncloud/enc_handle_empty_files | Clark Tomlinson | 2015-04-29 | 4 | -34/+118 |
|\ | | | | | Encryption improve handling of empty and unencrypted files | ||||
| * | method shouldn't be static | Bjoern Schiessle | 2015-04-28 | 1 | -1/+1 |
| | | |||||
| * | also create encryption keys for empty files | Bjoern Schiessle | 2015-04-28 | 2 | -23/+42 |
| | | |||||
| * | skip update of encryption keys if file is not encrypted | Bjoern Schiessle | 2015-04-28 | 3 | -13/+78 |
| | | |||||
* | | Merge pull request #15908 from owncloud/fix-replace-with-sed | Vincent Petry | 2015-04-29 | 10 | -10/+10 |
|\ \ | | | | | | | Replace `replace` with `sed` statement | ||||
| * | | Replace `replace` with `sed` statement | Morris Jobke | 2015-04-29 | 10 | -10/+10 |
| |/ | |||||
* | | Merge pull request #15596 from owncloud/issue/15589 | Morris Jobke | 2015-04-29 | 2 | -9/+31 |
|\ \ | | | | | | | Correctly generate the feedback URL for remote share | ||||
| * | | Add tests for the correct share id on the call aswell | Joas Schilling | 2015-04-28 | 1 | -3/+15 |
| | | | |||||
| * | | Correctly send Federate-Cloud Share Feedback against the remote share ID | Joas Schilling | 2015-04-28 | 1 | -6/+6 |
| | | | |||||
| * | | check the called URL | Joas Schilling | 2015-04-28 | 1 | -3/+13 |
| | | | |||||
| * | | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 1 | -1/+1 |
| |/ | | | | | | | | | The trailing slash was added in c78e3c4a7fa1d2f474ab58551e67a50e093f6ed8 to correctly generate the encryption keys | ||||
* | | Merge pull request #15911 from owncloud/enc_create_header_for_new_key | Björn Schießle | 2015-04-29 | 2 | -3/+14 |
|\ \ | | | | | | | make sure that we create a header for the encrypted private key | ||||
| * | | make sure that we create a header for the encrypted private key | Bjoern Schiessle | 2015-04-28 | 2 | -3/+14 |
| |/ | |||||
* | | Merge pull request #15706 from owncloud/fix-15705-master | Lukas Reschke | 2015-04-29 | 2 | -3/+6 |
|\ \ | | | | | | | move creation of shared key to the login handler | ||||
| * | | move creation of shared key to the login handler - fixes #15705 | Thomas Müller | 2015-04-17 | 2 | -3/+6 |
| | | | |||||
* | | | Merge pull request #15921 from cmeh/patch-4 | Thomas Müller | 2015-04-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Spelling in wizardTabElementary.js: Correct "More then …" to "More than …" | ||||
| * | | | Update wizardTabElementary.js | cmeh | 2015-04-28 | 1 | -1/+1 |
| | |/ | |/| | | | | Corrected "More then …" to "More than …". | ||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-29 | 4 | -108/+108 |
|/ / | |||||
* | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 22 | -216/+936 |
|\ \ | | | | | | | Propagate etags across shared storages | ||||
| * | | dont pass floats as timestamp to the changepropagator | Robin Appelman | 2015-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | safer teardown | Robin Appelman | 2015-04-27 | 1 | -1/+3 |
| | | | |||||
| * | | use microtime to prevent race conditions | Robin Appelman | 2015-04-27 | 1 | -3/+3 |
| | | | |||||
| * | | cleanup hooks | Robin Appelman | 2015-04-27 | 1 | -0/+7 |
| | | | |||||
| * | | triger propagation for webdav uploads | Robin Appelman | 2015-04-27 | 1 | -3/+3 |
| | | | | | | | | | | | | use post hooks for share etag propagator | ||||
| * | | fix merge | Robin Appelman | 2015-04-27 | 4 | -116/+76 |
| | | | |||||
| * | | fix propagation when renaming a directly reshared folder | Robin Appelman | 2015-04-27 | 1 | -2/+4 |
| | | | |||||
| * | | minor fixes | Robin Appelman | 2015-04-27 | 4 | -10/+10 |
| | | | |||||
| * | | add rename hook for propagation | Robin Appelman | 2015-04-27 | 2 | -0/+16 |
| | | | |||||
| * | | propagate changes up reshares | Robin Appelman | 2015-04-27 | 1 | -0/+10 |
| | | | |||||
| * | | Make sure the owner mountpoints are setup | Robin Appelman | 2015-04-27 | 2 | -1/+5 |
| | | | |||||
| * | | more propagation tests | Robin Appelman | 2015-04-27 | 4 | -245/+429 |
| | | | |||||
| * | | remove duplicates from rebase | Robin Appelman | 2015-04-27 | 1 | -48/+0 |
| | | | |||||
| * | | adjust test | Robin Appelman | 2015-04-27 | 2 | -2/+7 |
| | | | |||||
| * | | dont use our now non existing hook | Robin Appelman | 2015-04-27 | 2 | -2/+6 |
| | | | |||||
| * | | propagate etags for all user of a share | Robin Appelman | 2015-04-27 | 13 | -93/+509 |
| | | | |||||
| * | | Allow getting *all* share entries owned by a user | Robin Appelman | 2015-04-27 | 1 | -1/+3 |
| | | | |||||
| * | | unit test for etag propagation across shared storage boundary | Robin Appelman | 2015-04-27 | 1 | -2/+158 |
| | | | |||||
* | | | Merge pull request #15773 from owncloud/fix-15766 | Thomas Müller | 2015-04-28 | 2 | -13/+25 |
|\ \ \ | | | | | | | | | LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766 | ||||
| * | | | save configs when requesting a config ID. They are empty, but avoid configID ↵ | Arthur Schiwon | 2015-04-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | collisioning when creating many new configs in the wizard without saving anything directly. | ||||
| * | | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, ↵ | Arthur Schiwon | 2015-04-21 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | | fixes #15766 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-28 | 4 | -0/+4 |
| | | | | |||||
* | | | | Fix file name validation in New menu | Vincent Petry | 2015-04-27 | 2 | -10/+61 |
| | | | | |||||
* | | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 4 | -4/+49 |
|\ \ \ \ | |_|/ / |/| | | | [encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6) | ||||
| * | | | fall back to the ownCloud default encryption module and aes128 if we read a ↵ | Bjoern Schiessle | 2015-04-27 | 4 | -4/+49 |
| | | | | | | | | | | | | | | | | encrypted file without a header | ||||
* | | | | Fix module registration | Joas Schilling | 2015-04-27 | 1 | -1/+3 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-27 | 12 | -0/+62 |
| | | |