Skip to content

Commit

Permalink
Merge branch 'release-v2.6.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
evpobr committed Jul 20, 2017
2 parents d4a6744 + 7f644db commit 17b6bff
Show file tree
Hide file tree
Showing 57 changed files with 746 additions and 1,089 deletions.
209 changes: 148 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,51 @@ local.properties
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# Build results
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
build/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*_h.h
*.ilk
*.meta
*.obj
Expand All @@ -75,38 +103,64 @@ build/
*.vssscc
.builds
*.pidb
*.log
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
*.ncrunch*
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/
Expand All @@ -125,97 +179,130 @@ DocProject/Help/html
publish/

# Publish Web Output
*.Publish.xml
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
packages/

# Windows Azure Build Output
csx
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
*.mdf
*.ldf

#############
## Windows detritus
#############
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Windows image file caches
Thumbs.db
ehthumbs.db
# Microsoft Fakes
FakesAssemblies/

# Folder config file
Desktop.ini
# GhostDoc plugin setting file
*.GhostDoc.xml

# Recycle Bin used on file shares
$RECYCLE.BIN/
# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Mac crap
.DS_Store
# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

#############
## Python
#############
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

*.py[cod]
# Paket dependency manager
.paket/paket.exe
paket-files/

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg
# FAKE - F# Make
.fake/

# Installer logs
pip-log.txt
# JetBrains Rider
.idea/
*.sln.iml

# Unit test / coverage reports
.coverage
.tox
# CodeRush
.cr/

#Translations
*.mo
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

#Mr Developer
.mr.developer.cfg
*.opendb
/FBE.h
installer/Input/
installer/*.exe
/FBE/ExportHTML/ExportHTML_i.h
# Cake - Uncomment if you are using it
# tools/

# Misc ignores

FBE.h
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# FictionBook Editor Changelog

## v2.6.11

* Add thumbnail handler shell extension
* Use VS2017 compiler

## v2.6.10

* 64-bit FBShell build - now shell extension works under 64-bit OS. The installer will automatically install the correct version.
Expand Down
1 change: 1 addition & 0 deletions FBE/AboutBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <sstream>
#include <fstream>
#include <math.h>
#include <memory>
#include "ModelessDialog.h"
#include "extras/http_download.h"
#include "extras/MD5.h"
Expand Down
10 changes: 5 additions & 5 deletions FBE/ExportHTML/ExportHTML.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "atlres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Expand Down Expand Up @@ -40,7 +40,7 @@ END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""atlres.h""\r\n"
"\0"
END

Expand All @@ -59,7 +59,7 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,10,0
FILEVERSION 2,6,11,0
PRODUCTVERSION 2,6,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
Expand All @@ -77,9 +77,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "FBE Team"
VALUE "FileDescription", "FictionBook Editor HTML export plugin"
VALUE "FileVersion", "2.6.10.0"
VALUE "FileVersion", "2.6.11.0"
VALUE "InternalName", "ExportHTML"
VALUE "LegalCopyright", "Copyright 2016 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
VALUE "OriginalFilename", "ExportHTML.dll"
VALUE "ProductName", "FictionBook Editor"
VALUE "ProductVersion", "2.6"
Expand Down
Loading

0 comments on commit 17b6bff

Please sign in to comment.