summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-2822-10/+68
|
* Add missing annotations for parametersLukas Reschke2015-06-272-9/+16
|
* Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27118-114/+327
|\ | | | | Update license headers
| * update license headers and authorsMorris Jobke2015-06-25118-114/+327
| |
* | Merge pull request #17199 from ↵Lukas Reschke2015-06-272-0/+19
|\ \ | | | | | | | | | | | | owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
| * | add check if server returns a 500 and display errorClark Tomlinson2015-06-262-0/+19
| | | | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2718-4/+46
| | |
* | | Signature of overriding method should match the parentOlivier Paroz2015-06-261-1/+1
|/ /
* | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-261-0/+4
|\ \ | | | | | | Improve splitting of username and remote adress when username contains an `@`
| * | Use \OC\HintException and translate the hintJoas Schilling2015-06-221-0/+4
| | |
* | | Merge pull request #17082 from owncloud/shared-etag-propagate-fileThomas Müller2015-06-264-12/+51
|\ \ \ | | | | | | | | Fix etag propagation for single file shares
| * | | add some docsRobin Appelman2015-06-251-0/+2
| | | |
| * | | fix etag propagation for single file sharesRobin Appelman2015-06-243-12/+37
| | | |
| * | | add unit test for single file share etag propagationRobin Appelman2015-06-241-0/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2644-40/+14
| |_|/ |/| |
* | | Merge pull request #17152 from owncloud/LDAP/AD-TypoMorris Jobke2015-06-251-1/+1
|\ \ \ | | | | | | | | Ldap/ad typo
| * | | Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
| | | | | | | | | | | | | | | | We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2536-20/+94
|/ / /
* | | Merge pull request #17110 from owncloud/share-error-handlingMorris Jobke2015-06-241-2/+10
|\ \ \ | | | | | | | | [sharing] handle shares of users that aren't available anymore
| * | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-2/+10
| | | | | | | | | | | | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | | | Merge pull request #17136 from rullzer/fix_remove_link_OCSLukas Reschke2015-06-241-1/+23
|\ \ \ \ | |_|/ / |/| | | Allow removing of link password in OCS again
| * | | Added unit test to verify link password removealRoeland Jago Douma2015-06-241-1/+23
| | | |
* | | | Rename user_webdavauth to prevent accidental activation - refs #17112Thomas Müller2015-06-241-3/+3
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-246-6/+12
| | |
* | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-messageVincent Petry2015-06-232-0/+19
|\ \ \ | |/ / |/| | adding correct blocking logic for ffw
| * | adding correct blocking logic for fffClark Tomlinson2015-06-222-0/+19
| | |
* | | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-1/+1
|\ \ \ | | | | | | | | encryption improvements
| * | | remove files_encryption from database at the end of the migration processBjoern Schiessle2015-06-191-1/+1
| | | |
* | | | Merge pull request #17085 from owncloud/use-trusted-mimetypeMorris Jobke2015-06-231-1/+1
|\ \ \ \ | | | | | | | | | | Use trusted mimetype
| * | | | Use trusted mimetypeLukas Reschke2015-06-221-1/+1
| | |_|/ | |/| | | | | | | | | | We shall not use untrusted mimetypes in this context
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2310-10/+42
| | | |
* | | | Merge pull request #16940 from owncloud/ext-s3-touchmtimefixThomas Müller2015-06-221-8/+13
|\ \ \ \ | | | | | | | | | | Properly set mtime on S3 for touch operation
| * | | | Properly set mtime on S3 for touch operationVincent Petry2015-06-151-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was missing the "MetadataDirective". Once added, some other parts of the code failed because the format of mtime was wrong. So this PR uses the RFC format that the S3 library already uses. Additionally, the code path where mtime is null was missing. Now defaulting to the current time.
* | | | | Merge pull request #17068 from owncloud/fix_16878VicDeo2015-06-221-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | fix search for results only from subfolder
| * | | | remove whitespace on bottom when no search results, fix laylout, fix #16878Jan-Christoph Borchardt2015-06-221-2/+2
| | | | |
| * | | | add filter-empty class if no search result in current folderBjoern Schiessle2015-06-221-0/+2
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-222-2/+16
| | | |
* | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydirRobin McCorkell2015-06-211-1/+5
|\ \ \ \ | | | | | | | | | | Workaround for empty dir deletion for SFTP
| * | | | Workaround for empty dir deletion for SFTPVincent Petry2015-06-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly clear the stat cache after deleting an empty folder to make sure it is properly detected as deleted in subsequent requests. This works around a problem with phpseclib where the folder is properly deleted remotely but the stat cache was not updated.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2110-4/+88
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2022-26/+144
| |_|_|/ |/| | |
* | | | Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-uploadThomas Müller2015-06-191-0/+4
|\ \ \ \ | |_|/ / |/| | | [master] Verify if path exists
| * | | Verify if path existsLukas Reschke2015-06-181-0/+4
| |/ / | | | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-06-1936-70/+36
|/ /
* | Merge pull request #16692 from owncloud/add_social_media_buttonsBjörn Schießle2015-06-1811-6/+650
|\ \ | | | | | | Add social media buttons
| * | add id to urlBjoern Schiessle2015-06-182-7/+7
| | |
| * | fix look of 'Share with me via ownCloud' button, fix wordingJan-Christoph Borchardt2015-06-173-51/+11
| | |
| * | fix path to owncloud logoBjoern Schiessle2015-06-172-2/+4
| | |
| * | make the click actions workBjoern Schiessle2015-06-172-7/+9
| | |
| * | federated cloud ID: add icons, fix HTML & layout, fix wordingJan-Christoph Borchardt2015-06-1710-39/+382
| | |