summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | add social media button for diaspora, twitter, facebook and google+Bjoern Schiessle2015-06-177-6/+343
| | |
* | | Merge pull request #16890 from owncloud/fix-16588Thomas Müller2015-06-182-6/+10
|\ \ \ | | | | | | | | the user is gone, userExists will not bring him back. But the user's …
| * | | delete user test to take getHome into account to ensure it is also deleted ↵Arthur Schiwon2015-06-171-1/+4
| | | | | | | | | | | | | | | | subsequently
| * | | the user is gone, userExists will not bring him back. But the user's folder ↵Arthur Schiwon2015-06-111-5/+6
| | | | | | | | | | | | | | | | needs to be deleted anyway
* | | | Merge pull request #16993 from owncloud/verify-if-path-existsLukas Reschke2015-06-181-0/+7
|\ \ \ \ | | | | | | | | | | [master] Verify if path exists
| * | | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| | | | |
| * | | | Verify if path existsLukas Reschke2015-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | We need to verify if the specified path exists to gracefully prevent errors.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1820-14/+152
| | | | |
* | | | | Merge pull request #16893 from owncloud/fixSlideToggleMorris Jobke2015-06-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix childs of slideToggle not sliding the target
| * | | | remove unneeded span around Settings text, fixes cursorJan-Christoph Borchardt2015-06-171-1/+1
| | | | |
* | | | | Merge pull request #16729 from owncloud/scanner-read-lockThomas Müller2015-06-171-0/+11
|\ \ \ \ \ | | | | | | | | | | | | keep a read lock while scanning a file or folder
| * | | | | explain pre-hook scanRobin Appelman2015-06-151-0/+1
| | | | | |
| * | | | | ensure we dont have to scan a file in the trash wrapperRobin Appelman2015-06-151-0/+10
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-178-4/+12
| | | | | |
* | | | | | Merge pull request #16938 from owncloud/ext-s3-opendirduplicateMorris Jobke2015-06-161-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Skip directory entry in S3 opendir