Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17152 from owncloud/LDAP/AD-Typo | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
|\ | | | | | Ldap/ad typo | ||||
| * | Dropped an S from the mouseover | Lukas Reschke | 2015-06-24 | 1 | -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 transifex | Jenkins for ownCloud | 2015-06-25 | 36 | -20/+94 |
|/ | |||||
* | Merge pull request #17110 from owncloud/share-error-handling | Morris Jobke | 2015-06-24 | 1 | -2/+10 |
|\ | | | | | [sharing] handle shares of users that aren't available anymore | ||||
| * | [sharing] handle shares of users that aren't available anymore | Morris Jobke | 2015-06-23 | 1 | -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_OCS | Lukas Reschke | 2015-06-24 | 1 | -1/+23 |
|\ \ | | | | | | | Allow removing of link password in OCS again | ||||
| * | | Added unit test to verify link password removeal | Roeland Jago Douma | 2015-06-24 | 1 | -1/+23 |
| | | | |||||
* | | | Rename user_webdavauth to prevent accidental activation - refs #17112 | Thomas Müller | 2015-06-24 | 1 | -3/+3 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-24 | 6 | -6/+12 |
| | | |||||
* | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message | Vincent Petry | 2015-06-23 | 2 | -0/+19 |
|\ \ | |/ |/| | adding correct blocking logic for ffw | ||||
| * | adding correct blocking logic for fff | Clark Tomlinson | 2015-06-22 | 2 | -0/+19 |
| | | |||||
* | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 1 | -1/+1 |
|\ \ | | | | | | | encryption improvements | ||||
| * | | remove files_encryption from database at the end of the migration process | Bjoern Schiessle | 2015-06-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17085 from owncloud/use-trusted-mimetype | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use trusted mimetype | ||||
| * | | | Use trusted mimetype | Lukas Reschke | 2015-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | We shall not use untrusted mimetypes in this context | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-23 | 10 | -10/+42 |
| | | | | |||||
* | | | | Merge pull request #16940 from owncloud/ext-s3-touchmtimefix | Thomas Müller | 2015-06-22 | 1 | -8/+13 |
|\ \ \ \ | | | | | | | | | | | Properly set mtime on S3 for touch operation | ||||
| * | | | | Properly set mtime on S3 for touch operation | Vincent Petry | 2015-06-15 | 1 | -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_16878 | VicDeo | 2015-06-22 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | fix search for results only from subfolder | ||||
| * | | | | remove whitespace on bottom when no search results, fix laylout, fix #16878 | Jan-Christoph Borchardt | 2015-06-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | add filter-empty class if no search result in current folder | Bjoern Schiessle | 2015-06-22 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-22 | 2 | -2/+16 |
| | | | | |||||
* | | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydir | Robin McCorkell | 2015-06-21 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Workaround for empty dir deletion for SFTP | ||||
| * | | | | Workaround for empty dir deletion for SFTP | Vincent Petry | 2015-06-18 | 1 | -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 transifex | Jenkins for ownCloud | 2015-06-21 | 10 | -4/+88 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 22 | -26/+144 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload | Thomas Müller | 2015-06-19 | 1 | -0/+4 |
|\ \ \ \ | |_|/ / |/| | | | [master] Verify if path exists | ||||
| * | | | Verify if path exists | Lukas Reschke | 2015-06-18 | 1 | -0/+4 |
| |/ / | | | | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously. | ||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-19 | 36 | -70/+36 |
|/ / | |||||
* | | Merge pull request #16692 from owncloud/add_social_media_buttons | Björn Schießle | 2015-06-18 | 11 | -6/+650 |
|\ \ | | | | | | | Add social media buttons | ||||
| * | | add id to url | Bjoern Schiessle | 2015-06-18 | 2 | -7/+7 |
| | | | |||||
| * | | fix look of 'Share with me via ownCloud' button, fix wording | Jan-Christoph Borchardt | 2015-06-17 | 3 | -51/+11 |
| | | | |||||
| * | | fix path to owncloud logo | Bjoern Schiessle | 2015-06-17 | 2 | -2/+4 |
| | | | |||||
| * | | make the click actions work | Bjoern Schiessle | 2015-06-17 | 2 | -7/+9 |
| | | | |||||
| * | | federated cloud ID: add icons, fix HTML & layout, fix wording | Jan-Christoph Borchardt | 2015-06-17 | 10 | -39/+382 |
| | | | |||||
| * | | add social media button for diaspora, twitter, facebook and google+ | Bjoern Schiessle | 2015-06-17 | 7 | -6/+343 |
| | | | |||||
* | | | Merge pull request #16890 from owncloud/fix-16588 | Thomas Müller | 2015-06-18 | 2 | -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 Schiwon | 2015-06-17 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | subsequently | ||||
| * | | | the user is gone, userExists will not bring him back. But the user's folder ↵ | Arthur Schiwon | 2015-06-11 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | needs to be deleted anyway | ||||
* | | | | Merge pull request #16993 from owncloud/verify-if-path-exists | Lukas Reschke | 2015-06-18 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | [master] Verify if path exists | ||||
| * | | | | Throw nicer error message instead 500 | Lukas Reschke | 2015-06-17 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Verify if path exists | Lukas Reschke | 2015-06-17 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | We need to verify if the specified path exists to gracefully prevent errors. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-18 | 20 | -14/+152 |
| | | | | | |||||
* | | | | | Merge pull request #16893 from owncloud/fixSlideToggle | Morris Jobke | 2015-06-17 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix childs of slideToggle not sliding the target | ||||
| * | | | | remove unneeded span around Settings text, fixes cursor | Jan-Christoph Borchardt | 2015-06-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16729 from owncloud/scanner-read-lock | Thomas Müller | 2015-06-17 | 1 | -0/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | keep a read lock while scanning a file or folder | ||||
| * | | | | | explain pre-hook scan | Robin Appelman | 2015-06-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | ensure we dont have to scan a file in the trash wrapper | Robin Appelman | 2015-06-15 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-17 | 8 | -4/+12 |
| | | | | | | |||||
* | | | | | | Merge pull request #16938 from owncloud/ext-s3-opendirduplicate | Morris Jobke | 2015-06-16 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Skip directory entry in S3 opendir |