aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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 fffClark Tomlinson2015-06-222-0/+19
* | Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-1/+1
|\ \
| * | 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 mimetypeLukas Reschke2015-06-221-1/+1
* | | | [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 operationVincent Petry2015-06-151-8/+13
* | | | | Merge pull request #17068 from owncloud/fix_16878VicDeo2015-06-221-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 SFTPVincent Petry2015-06-181-1/+5
* | | | | [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
|\ \ \ \ | |_|/ / |/| | |
| * | | Verify if path existsLukas Reschke2015-06-181-0/+4
| |/ /
* / / [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 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
|\ \ \
| * | | delete user test to take getHome into account to ensure it is also deleted su...Arthur Schiwon2015-06-171-1/+4
| * | | the user is gone, userExists will not bring him back. But the user's folder n...Arthur Schiwon2015-06-111-5/+6
* | | | Merge pull request #16993 from owncloud/verify-if-path-existsLukas Reschke2015-06-181-0/+7
|\ \ \ \
| * | | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| * | | | Verify if path existsLukas Reschke2015-06-171-0/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1820-14/+152
* | | | | Merge pull request #16893 from owncloud/fixSlideToggleMorris Jobke2015-06-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | 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 opendirVincent Petry2015-06-151-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-166-4/+138
| |/ / / / |/| | | |
* | | | | Merge pull request #16911 from oparoz/prettier-public-thumbnailsThomas Müller2015-06-151-2/+4
|\ \ \ \ \
| * | | | | floats are not welcome when setting the size of a previewOlivier Paroz2015-06-121-4/+4
| * | | | | Determine the size we need before asking for a thumbnailOlivier Paroz2015-06-121-0/+2
* | | | | | Merge pull request #16885 from owncloud/files-previewurlresolutionroundingThomas Müller2015-06-151-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Truncate preview resolutionVincent Petry2015-06-111-1/+3
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-158-10/+168