Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | Block old legacy clients | Lukas Reschke | 2015-04-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance. This has multiple reasons: 1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse 2. Old ownCloud client versions tend to be horrible buggy In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client | ||||
* | | Merge pull request #15855 from owncloud/teardownaftercommand | Lukas Reschke | 2015-04-24 | 1 | -0/+1 |
|\ \ | | | | | | | Tear down FS after running trash expire | ||||
| * | | 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 | ||||
| * | | Show hint if there is no delete permission | Morris Jobke | 2015-04-23 | 4 | -4/+59 |
| | | | | | | | | | | | | | | | | | | * add class .no-permission which shows the default delete icon * fixes #15172 * add unit test for no permission and for delete permission | ||||
* | | | [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 webdav access for public reshare | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | update icewind/smb to 1.0.1 | ||||
| * | | | | update icewind/smb to 1.0.1 | Robin Appelman | 2015-04-22 | 5 | -17/+16 |
| |/ / / | |||||
* | / / | Only get encryption status when logged in | Vincent Petry | 2015-04-23 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | This removes useless warnings in the logs. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-23 | 32 | -6/+162 |
| | | | |||||
* | | | Merge pull request #15805 from owncloud/fileslist-whitespace | Morris Jobke | 2015-04-22 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | add whitespace to bottom of files list to correctly show dropdowns | ||||
| * | | | add whitespace to bottom of files list to correctly show dropdowns, fix #15801 | Jan-Christoph Borchardt | 2015-04-22 | 1 | -3/+4 |
| | | | | |||||
* | | | | Merge pull request #15799 from owncloud/fix-enc-folder-move | Thomas Müller | 2015-04-22 | 4 | -32/+46 |
|\ \ \ \ | |_|/ / |/| | | | Fix enc folder move | ||||
| * | | | add $encryptionModuleId to methods of Keys/IStorage | Thomas Müller | 2015-04-22 | 4 | -32/+46 |
| |/ / | |||||
* | | | Merge pull request #15787 from owncloud/trash-partfiles | Morris Jobke | 2015-04-22 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | Do not trash part files, delete directly | ||||
| * | | Do not trash part files, delete directly | Vincent Petry | 2015-04-21 | 1 | -1/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-22 | 92 | -8/+296 |
|/ / | |||||
* | | Merge pull request #15782 from owncloud/hide-modified-multiselect | Morris Jobke | 2015-04-21 | 1 | -1/+10 |
|\ \ | | | | | | | hide modified header when multiselect is active, fix #15779 | ||||
| * | | hide modified header when multiselect is active, fix #15779 | Jan-Christoph Borchardt | 2015-04-21 | 1 | -1/+10 |
| | | | |||||
* | | | Merge pull request #15721 from oparoz/fix-readonly-cache | Thomas Müller | 2015-04-21 | 2 | -1/+96 |
|\ \ \ | | | | | | | | | Fix read-only cache | ||||
| * | | | Renamed class + split methods | Olivier Paroz | 2015-04-21 | 1 | -25/+13 |
| | | | | |||||
| * | | | Tests for read-only cache | Olivier Paroz | 2015-04-18 | 1 | -0/+105 |
| | | | | |||||
| * | | | Thou shalt not corrupt the answer of a cache request | Olivier Paroz | 2015-04-18 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonly | Jan-Christoph Borchardt | 2015-04-21 | 4 | -5/+16 |
|\ \ \ \ | | | | | | | | | | | Added empty content message for empty read-only folders | ||||
| * | | | | Added empty content message for empty read-only folders | Vincent Petry | 2015-04-21 | 4 | -5/+16 |
| | | | | | |||||
* | | | | | Merge pull request #15770 from owncloud/fix-15764 | Morris Jobke | 2015-04-21 | 1 | -1/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | bring back border in host input field for consistency | ||||
| * | | | | bring back border in host input field for consistency | Arthur Schiwon | 2015-04-21 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge pull request #15713 from owncloud/fix-15707-master | Morris Jobke | 2015-04-21 | 3 | -35/+41 |
|\ \ \ \ | |/ / / |/| | | | [enc2] Fixing JS errors | ||||
| * | | | doc and indent | Thomas Müller | 2015-04-21 | 2 | -4/+8 |
| | | | | |||||
| * | | | Don't pollute the global namespace | Thomas Müller | 2015-04-21 | 2 | -29/+38 |
| | | | | |||||
| * | | | make jshint happy | Thomas Müller | 2015-04-20 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d. | ||||
| * | | | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-20 | 1 | -23/+13 |
| | | | | | | | | | | | | | | | | This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-21 | 6 | -8/+24 |
|/ / / | |||||
* | | | Merge pull request #15677 from owncloud/enc_reset_private_key_password | Thomas Müller | 2015-04-20 | 5 | -10/+379 |
|\ \ \ | | | | | | | | | [encryption] let user update the private key password | ||||
| * | | | Dont use the old .status way | Joas Schilling | 2015-04-20 | 3 | -24/+12 |
| | | | | |||||
| * | | | Fix several minor things | Joas Schilling | 2015-04-20 | 2 | -24/+21 |
| | | | | |||||
| * | | | let user update the private key password in case the login password was ↵ | Bjoern Schiessle | 2015-04-17 | 4 | -0/+384 |
| | | | | | | | | | | | | | | | | changed from outside | ||||
* | | | | Avoid function name collision in dropbox external storage | Thomas Müller | 2015-04-20 | 1 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #15637 from owncloud/migrate-certificate-stuff | Lukas Reschke | 2015-04-20 | 1 | -6/+0 |
|\ \ \ \ | | | | | | | | | | | Migrate personal certificate handling to AppFramework controllers | ||||
| * | | | | Migrate personal certificate handling into AppFramework controllers | Lukas Reschke | 2015-04-20 | 1 | -6/+0 |
| | |_|/ | |/| | | | | | | | | | | Also added unit-tests and better error-handling | ||||
* / | | | move away from deprecated consts | Arthur Schiwon | 2015-04-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #15717 from ↵ | Morris Jobke | 2015-04-20 | 12 | -41/+44 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage |