Merge pull request #4381 from OPM/dev

Merge dev into master for Release 2019.04

.appveyor.yml

@@ -0,0 +1,20 @@
+version: 1.0.{build}
+branches:
+  only:
+  - dev
+image: Visual Studio 2017
+clone_depth: 1
+environment:
+  QT5: C:\Qt\5.10.1\msvc2017_64
+configuration: Release
+build_script:
+- cmd: >-
+    mkdir cmakebuild
+    
+    cd cmakebuild
+
+    if exist "%QT5%" set Path=%QT5%\bin;%Path%
+
+    cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DRESINSIGHT_BUILD_WITH_QT5=true -DRESINSIGHT_ENABLE_COTIRE=on "-DCMAKE_PREFIX_PATH=%QT5%" ..
+
+    cmake --build . --target ResInsight_unity --config Release

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          '-*,modernize-use-nullptr,modernize-use-override'
+Checks:          '-*,modernize-use-nullptr,modernize-use-override,modernize-deprecated-headers'
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
 ...

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,10 @@
+---
+name: Enhancement
+about: Describe enhancement.
+title: 'Context : EnhancementName'
+labels: Enhancement
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: FeatureRequest
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

ApplicationCode/Adm/RiaVersionInfo.h.cmake

@@ -26,3 +26,5 @@
 // Externally shipped versions should have even build numbers
 #define PRODUCTVER     "@PRODUCTVER@"
 #define STRPRODUCTVER  "@STRPRODUCTVER@"
+
+#define RESINSIGHT_OCTAVE_VERSION "@OCTAVE_VERSION_STRING@"