Merge pull request #1 from code4recovery/master

Upstream
code4recovery · Sep 21, 2020 · c1a0812 · c1a0812
2 parents 218bd4b + a12d107
commit c1a0812
Show file tree

Hide file tree

Showing 16 changed files with 913 additions and 654 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 .idea
 Dockerfile
 docker-compose.yml
+.vscode
diff --git a/.prettierrc b/.prettierrc
@@ -1,3 +1,7 @@
 {
-  "trailingComma": "none"
+	"trailingComma": "none",
+	"singleQuote": true,
+	"printWidth": 140,
+	"bracketSpacing": false,
+	"useTabs": true
 }
diff --git a/12-step-meeting-list.php b/12-step-meeting-list.php
@@ -3,7 +3,7 @@
 Plugin Name: 12 Step Meeting List
 Plugin URI: https://wordpress.org/plugins/12-step-meeting-list/
 Description: Manage a list of recovery meetings
-Version: 3.7.2
+Version: 3.8.0
 Author: Code4Recovery
 Author URI: https://github.com/code4recovery/12-step-meeting-list
 Text Domain: 12-step-meeting-list
@@ -23,7 +23,7 @@
 }
 
 if (!defined('TSML_VERSION')) {
-    define('TSML_VERSION', '3.7.2');
+    define('TSML_VERSION', '3.8.0');
 }
 
 //include these files first

diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
diff --git a/assets/js/public.min.js b/assets/js/public.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ node_modules @@
     .idea
     Dockerfile
     docker-compose.yml
+    .vscode