summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-2616-0/+16
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-256-0/+6
|
* Merge pull request #15683 from owncloud/block-legacy-clientsLukas Reschke2015-04-241-0/+1
|\ | | | | Block old legacy clients
| * Block old legacy clientsLukas Reschke2015-04-201-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/teardownaftercommandLukas Reschke2015-04-241-0/+1
|\ \ | | | | | | Tear down FS after running trash expire
| * | Tear down FS after running trash expireVincent Petry2015-04-241-0/+1
| | |
* | | Merge pull request #15835 from owncloud/delete-permission-iconJan-Christoph Borchardt2015-04-244-4/+59
|\ \ \ | |/ / |/| | Show hint if there is no delete permission
| * | Show hint if there is no delete permissionMorris Jobke2015-04-234-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 transifexJenkins for ownCloud2015-04-246-6/+6
| | |
* | | Merge pull request #15814 from owncloud/public-reshare-webdavVincent Petry2015-04-234-139/+6
|\ \ \ | | | | | | | | Fix webdav access for public reshare
| * | | fix subfolder reshares over webdavRobin Appelman2015-04-231-2/+2
| | | |
| * | | remove unneeded readonlycacheRobin Appelman2015-04-221-44/+0
| | | |
| * | | resolve reshares in public webdavRobin Appelman2015-04-221-3/+4
| | | |
| * | | use the permissions mask cache wrapper instead of the read only cacheRobin Appelman2015-04-222-94/+4
| | | |
* | | | Merge pull request #15828 from owncloud/smb-1.0.1Thomas Müller2015-04-235-17/+16
|\ \ \ \ | | | | | | | | | | update icewind/smb to 1.0.1
| * | | | update icewind/smb to 1.0.1Robin Appelman2015-04-225-17/+16
| |/ / /
* | / / Only get encryption status when logged inVincent Petry2015-04-231-1/+1
| |/ / |/| | | | | | | | This removes useless warnings in the logs.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2332-6/+162
| | |
* | | Merge pull request #15805 from owncloud/fileslist-whitespaceMorris Jobke2015-04-221-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 #15801Jan-Christoph Borchardt2015-04-221-3/+4
| | | |
* | | | Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-224-32/+46
|\ \ \ \ | |_|/ / |/| | | Fix enc folder move
| * | | add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-224-32/+46
| |/ /
* | | Merge pull request #15787 from owncloud/trash-partfilesMorris Jobke2015-04-221-1/+4
|\ \ \ | |/ / |/| | Do not trash part files, delete directly
| * | Do not trash part files, delete directlyVincent Petry2015-04-211-1/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2292-8/+296
|/ /
* | Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\ \ | | | | | | hide modified header when multiselect is active, fix #15779
| * | hide modified header when multiselect is active, fix #15779Jan-Christoph Borchardt2015-04-211-1/+10
| | |
* | | Merge pull request #15721 from oparoz/fix-readonly-cacheThomas Müller2015-04-212-1/+96
|\ \ \ | | | | | | | | Fix read-only cache
| * | | Renamed class + split methodsOlivier Paroz2015-04-211-25/+13
| | | |
| * | | Tests for read-only cacheOlivier Paroz2015-04-181-0/+105
| | | |
| * | | Thou shalt not corrupt the answer of a cache requestOlivier Paroz2015-04-181-1/+3
| | | |
* | | | Merge pull request #15769 from owncloud/files-emptycontentreadonlyJan-Christoph Borchardt2015-04-214-5/+16
|\ \ \ \ | | | | | | | | | | Added empty content message for empty read-only folders
| * | | | Added empty content message for empty read-only foldersVincent Petry2015-04-214-5/+16
| | | | |
* | | | | Merge pull request #15770 from owncloud/fix-15764Morris Jobke2015-04-211-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | bring back border in host input field for consistency
| * | | | bring back border in host input field for consistencyArthur Schiwon2015-04-211-1/+0
| |/ / /
* | | | Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-213-35/+41
|\ \ \ \ | |/ / / |/| | | [enc2] Fixing JS errors
| * | | doc and indentThomas Müller2015-04-212-4/+8
| | | |
| * | | Don't pollute the global namespaceThomas Müller2015-04-212-29/+38
| | | |
| * | | make jshint happyThomas Müller2015-04-202-14/+17
| | | | | | | | | | | | | | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d.
| * | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
| | | | | | | | | | | | | | | | This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-216-8/+24
|/ / /
* | | Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ \ \ | | | | | | | | [encryption] let user update the private key password
| * | | Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| | | |
| * | | Fix several minor thingsJoas Schilling2015-04-202-24/+21
| | | |
| * | | let user update the private key password in case the login password was ↵Bjoern Schiessle2015-04-174-0/+384
| | | | | | | | | | | | | | | | changed from outside
* | | | Avoid function name collision in dropbox external storageThomas Müller2015-04-201-7/+7
| | | |
* | | | Merge pull request #15637 from owncloud/migrate-certificate-stuffLukas Reschke2015-04-201-6/+0
|\ \ \ \ | | | | | | | | | | Migrate personal certificate handling to AppFramework controllers
| * | | | Migrate personal certificate handling into AppFramework controllersLukas Reschke2015-04-201-6/+0
| | |_|/ | |/| | | | | | | | | | Also added unit-tests and better error-handling
* / | | move away from deprecated constsArthur Schiwon2015-04-201-1/+1
|/ / /
* | | Merge pull request #15717 from ↵Morris Jobke2015-04-2012-41/+44
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage