Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | 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 - 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update wizardTabElementary.js | cmeh | 2015-04-28 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* / | | | | [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 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
| * | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | save configs when requesting a config ID. They are empty, but avoid configID ... | Arthur Schiwon | 2015-04-21 | 1 | -2/+2 | |
| * | | | | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, f... | Arthur Schiwon | 2015-04-21 | 1 | -11/+23 | |
* | | | | | | [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 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 4 | -4/+49 | |
* | | | | | | 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 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-26 | 16 | -0/+16 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-25 | 6 | -0/+6 | |
* | | | | | Merge pull request #15683 from owncloud/block-legacy-clients | Lukas Reschke | 2015-04-24 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Block old legacy clients | Lukas Reschke | 2015-04-20 | 1 | -0/+1 | |
* | | | | | | Merge pull request #15855 from owncloud/teardownaftercommand | Lukas Reschke | 2015-04-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Tear down FS after running trash expire | Vincent Petry | 2015-04-24 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #15835 from owncloud/delete-permission-icon | Jan-Christoph Borchardt | 2015-04-24 | 4 | -4/+59 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Show hint if there is no delete permission | Morris Jobke | 2015-04-23 | 4 | -4/+59 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-24 | 6 | -6/+6 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge pull request #15814 from owncloud/public-reshare-webdav | Vincent Petry | 2015-04-23 | 4 | -139/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix subfolder reshares over webdav | Robin Appelman | 2015-04-23 | 1 | -2/+2 | |
| * | | | | | | remove unneeded readonlycache | Robin Appelman | 2015-04-22 | 1 | -44/+0 | |
| * | | | | | | resolve reshares in public webdav | Robin Appelman | 2015-04-22 | 1 | -3/+4 | |
| * | | | | | | use the permissions mask cache wrapper instead of the read only cache | Robin Appelman | 2015-04-22 | 2 | -94/+4 | |
* | | | | | | | Merge pull request #15828 from owncloud/smb-1.0.1 | Thomas Müller | 2015-04-23 | 5 | -17/+16 | |
|\ \ \ \ \ \ \ |