Merge branch 'development'

.gitignore

@@ -42,6 +42,6 @@ JASP.pro.user.b601785
 #Extracted testfiles 
 Resources/TestFiles
 
-
-JASP-Engine/JASP/R/.Rhistory
 *.autosave
+JASP-Engine/JASP/R/.Rhistory
+JASP-Tests/.Rhistory

.travis.yml

@@ -0,0 +1,25 @@
+language: r
+r: "3.3"
+cache: packages
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      before_install: [
+        "sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu/ xenial main\" -y",
+        "sudo apt-get update -q",
+        "echo 'Installing R package dependencies'",
+        "sudo apt-get install libfreetype6=2.6.1-0.1ubuntu2",
+        "sudo apt-get install libfreetype6-dev=2.6.1-0.1ubuntu2",
+        "sudo apt-get install libnlopt-dev",
+        "sudo apt-get install r-cran-rcppeigen",
+        "sudo apt-get install r-cran-plogr"
+      ]
+      install: Rscript -e 'install.packages(c("testthat", "vdiffr"))'
+      script:
+        - Rscript Tools/requiredPackages.R JASP-Engine/JASP/R true
+        - Rscript Tools/showVersion.R
+        - cd JASP-Tests/R/tests/
+        - R < testthat.R --no-save

CHANGES.md

@@ -2,23 +2,71 @@
 JASP Release Notes
 ==================
 
+Version 0.8.4
+-------------
+
+New Features:
+ - Added meta analysis
+ - Added network analysis
+ - Improved the module layout
+ - Added stepwise methods to logistic regression
+ - Added effect size measures to post-hoc analyses in ANOVA / ANCOVA
+ - Improved backwards compatibility for Linux users with older R versions
+
+Bugfixes:
+ - Fixed situation where JASPEngine process would linger after closing JASP
+ - Better handling of utf8 characters ((#1695), (#1704) and (#1719)
+ - Fixed confidence intervals cohens d (t-test)
+ - Fixed bug where prior posterior plot could not be made
+ - Fixed confusion in Subjective priors widget
+
+
+Version 0.8.3.1
+---------------
+
+Hotfix:
+ - p-value chi-square Logistic Regression (#2054)
+
+
 Version 0.8.3
 -------------
 
 New Features:
 
- - Frequentist Logistic Regression
- - Hierarchical model testing for Linear and Logistic Regression
  - New Progressbar (implemented for Bayesian ANOVAs and Regression)
  - Preference menu - specify missing values and  number of decimals
- - ANOVA - post-hoc tests, change y-axis label for descriptives plot
  - JASPTools package
+ - Added logistic regression
+ - Added hierarchical regression
+ - Added ability to add/change missing values
+ - Added progress bar to Bayesian ANOVA’s and regression
+ - Added preference option to change the number of decimals that are displayed
+ - Reworked the layout of the Preferences window
+ - Added option to toggle frequentist correlation table to pairwise display
+ - Added ability to change y-axis in RM ANOVA descriptives plots
+ - Added effect sizes to post-hoc tests ANOVA
+ - Added confidence intervals to rank correlations
+ - Changed display of Bayesian and frequentist correlations to below diagonal
+ - Removed autofilling of options when another instance of an analysis is started
 
 Changes:
 
  - Remove unused R packages
  - Additional Info for T-Test and Correlation Bayesian Pairs Robustness plots (Common module)
 
+Bugfixes:
+
+ - Fixed analysis crash when RM and between factors name match (#1906)
+ - Fixed bug where JASP crashes if you load data between running analyses
+ - Fixed issue where files from old JASP versions cause problems in newer versions
+ - Fixed bug where About window would go behind main window
+ - Fixed analysis crash when vovk-sellke was selected in correlations (#1959)
+ - Fixed issue with importing of PSPP files (#1966)
+ - Fixed issue where RM factor is reset when the analysis options are refreshed (#1921)
+ - Changed base of logarithm to e in Bayesian correlation matrix (#1981)
+ - Fixed vanishing of footnotes in Bayesian correlation matrix
+ - Fixed plot for logBF robustness in correlation pairs
+
 
 Version 0.5
 -----------
@@ -35,7 +83,7 @@ Changed:
 
  - Refinement of all the T-Tests (these are *really* polished now)
 
-Fixed:
+Bugfixes:
 
  - Fixes to add Linux support
  - Several bug fixes

CONTRIBUTING.md

@@ -0,0 +1,12 @@
+# Contributing to jasp
+
+Anyone is welcome to contribute to JASP. If you would like to create a new module/analysis, fix a
+bug you found, or implemented a feature, please submit a pull request. See
+[Dev Docs](Docs/development) for more details about the development.
+
+## Pull request process
+
+A pull request must be reviewed by at least one member of JASP. To ensure that (if applicable):
+
+  - The code should match the JASP style guide
+  - Tests should accompany any new analysis/module

Docs/development/jasp-building-guide.md

@@ -33,7 +33,7 @@ Windows
 Building JASP under windows is the most temperamental, and the versions listed here are known to work; slight variations on these numbers probably won't work.
 
  - [Qt 5.2.1 win64 GCC 4.8.2](https://static.jasp-stats.org/development/x64-Qt-5.2.1+QtCreator-3.0.1-(gcc-4.8.2-seh).7z)
- - [R 3.3.3 win64](https://static.jasp-stats.org/development/R3.3%20Win%20JASP%200.8.4.zip)
+ - [R 3.3.3 win64](https://static.jasp-stats.org/development/R3.3%20Win%20JASP%200.8.5.zip)
  - [boost 1.64.0](https://static.jasp-stats.org/development/boost_1_64_0.zip)
  - [boost 1.64.0 binaries, libarchive binaries](https://static.jasp-stats.org/development/Additional%20Binary%20Deps%20Win64%20for%20JASP%20(2017-06-06).zip)
 
@@ -64,21 +64,32 @@ To build JASP on mac you need to clone the JASP repository and download the foll
  0. Clone the JASP repository
  1. [XCode](https://developer.apple.com/xcode/) Easiest would be via the App Store.
  2. [Qt 5.4.0](https://download.qt.io/archive/qt/) Newer version not supported yet.
- 3. [R 3.3.3](https://static.jasp-stats.org/development/R3.3%20OSX%20JASP%200.8.3.zip) This contains R and the packages
+ 3. [R 3.3.3](https://static.jasp-stats.org/development/R3.3%20OSX%20JASP%200.8.5.zip) This contains R and the packages
  4. [boost 1.64.0](https://static.jasp-stats.org/development/boost_1_64_0.zip)
  5. [boost 1.64.0 binaries, libarchive binaries](https://static.jasp-stats.org/development/Additional%20Binary%20Deps%20OSX%20for%20JASP%20(2017-06-06).zip)
 
 The directory structure should be as follows:
 
-    [+] jasp-desktop  < from github >
-	[+] boost_1_64_0
-    [-] Frameworks
-       [+] R.framework
-    [+] build-JASP- ... < build directory, created by QtCreator >
-		- libboost_system-clang-mt-1_64.a
-		- libboost_filesystem-clang-mt-1_64.a
-		- libarchive.a
-		- libz.a
+    [+] JASP
+    	[-] code	
+    		[+] jasp-desktop  < from github >
+    	[-] build
+    		[-] debug < Build debug directory for QtCreator >
+    			- libboost_system-clang-mt-1_64.a
+    			- libboost_filesystem-clang-mt-1_64.a
+    			- libarchive.a
+     			- libz.a
+    		[-] release < Build release directory for QtCreator  >
+    			- libboost_system-clang-mt-1_64.a
+    			- libboost_filesystem-clang-mt-1_64.a
+    			- libarchive.a
+    			- libz.a
+    		[+] boost_1_64_0
+    		[-] Frameworks
+      			[-] R.framework
+    				[-] Versions
+     					[+] 3.3
+
 
  0. **Clone** the JASP repository into a folder of your choice. Our default choice is *~/desktop/JASP/* and cloning results in the creating of *~/desktop/JASP/jasp-desktop*.
  1. **XCode**: Qt on OS X relies on XCode to function, you can install this through the App Store. It's easiest if you install this, run it, accept the license agreement, and then close it down before installing Qt.