summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15921 from cmeh/patch-4Thomas Müller2015-04-291-1/+1
|\ | | | | Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
| * Update wizardTabElementary.jscmeh2015-04-281-1/+1
| | | | | | Corrected "More then …" to "More than …".
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-294-108/+108
|/
* Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-2822-216/+936
|\ | | | | Propagate etags across shared storages
| * dont pass floats as timestamp to the changepropagatorRobin Appelman2015-04-271-1/+1
| |
| * safer teardownRobin Appelman2015-04-271-1/+3
| |
| * use microtime to prevent race conditionsRobin Appelman2015-04-271-3/+3
| |
| * cleanup hooksRobin Appelman2015-04-271-0/+7
| |
| * triger propagation for webdav uploadsRobin Appelman2015-04-271-3/+3
| | | | | | | | use post hooks for share etag propagator
| * fix mergeRobin Appelman2015-04-274-116/+76
| |
| * fix propagation when renaming a directly reshared folderRobin Appelman2015-04-271-2/+4
| |
| * minor fixesRobin Appelman2015-04-274-10/+10
| |
| * add rename hook for propagationRobin Appelman2015-04-272-0/+16
| |
| * propagate changes up resharesRobin Appelman2015-04-271-0/+10
| |
| * Make sure the owner mountpoints are setupRobin Appelman2015-04-272-1/+5
| |
| * more propagation testsRobin Appelman2015-04-274-245/+429
| |
| * remove duplicates from rebaseRobin Appelman2015-04-271-48/+0
| |
| * adjust testRobin Appelman2015-04-272-2/+7
| |
| * dont use our now non existing hookRobin Appelman2015-04-272-2/+6
| |
| * propagate etags for all user of a shareRobin Appelman2015-04-2713-93/+509
| |
| * Allow getting *all* share entries owned by a userRobin Appelman2015-04-271-1/+3
| |
| * unit test for etag propagation across shared storage boundaryRobin Appelman2015-04-271-2/+158
| |
* | Merge pull request #15773 from owncloud/fix-15766Thomas Müller2015-04-282-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 Schiwon2015-04-211-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 Schiwon2015-04-211-11/+23
| | | | | | | | | | | | fixes #15766
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-284-0/+4
| | |
* | | Fix file name validation in New menuVincent Petry2015-04-272-10/+61
| | |
* | | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-274-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 Schiessle2015-04-274-4/+49
| | | | | | | | | | | | encrypted file without a header
* | | Fix module registrationJoas Schilling2015-04-271-1/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2712-0/+62
| |
* | [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