Release 2.12.0

CONTRIBUTING.md

@@ -14,6 +14,9 @@ Contributions via [pull request](https://github.com/WP-for-Church/Sermon-Manager
 and [bug reports](https://github.com/WP-for-Church/Sermon-Manager/issues) are welcome!
 Please submit your pull request to the `develop` branch and use the GitHub issue tracker to report issues.
 
+**Note!** If you have detected any security issues, please write an email to [email protected]. Do not submit it on the 
+public forum or in a public GitHub issue.
+
 ### Translations
 
 Is the plugin not available in your language or are some translations missing?
@@ -24,24 +27,26 @@ Create an account on [wordpress.org](wordpress.org) and you can start translatin
 [Sermon Manager's page](https://translate.wordpress.org/projects/wp-plugins/sermon-manager-for-wordpress).
 No coding skills are required at all.
 
+(Our integration with GlotPress is still not ready)
+
 # Development
 
 The default branch for the Sermon Manager repository on GitHub is **"master"**, while there is another important branch
 called **"dev"** (shortened for "develop"). Each of them serves their own purpose.
 
 ### master branch
 The **"master"** branch is a stable branch, and gets updated only on releases. Whenever people checkout/download the 
-**"master"** branch, they get the source code of the latest official release of the Sermon Manager.
+**"master"** branch, they get the source code of the latest official release of the Sermon Manager. (same as if they 
+downloaded the latest version on WordPress)
 
 ### dev branch
 The **"dev"** branch, is where commits during development are integrated into. It is where the WP For Church team
 pushes or merges their actual changes together and where contributions from the community (Pull requests) are
 integrated into the development version of the plugin. Anyone who wish to try the cutting edge version of Sermon Manager
 can download the develop branch and install it on their website.
 
-(Note: whenever a commit is created on develop branch, a
-development zip package is created by WordPress, which can be downloaded from 
-[here](https://downloads.wordpress.org/plugin/sermon-manager-for-wordpress.zip).)
+(Note: whenever a commit is created on develop branch, a development zip package is created by WordPress, which can be 
+downloaded from [here](https://downloads.wordpress.org/plugin/sermon-manager-for-wordpress.zip).)
 
 Pull requests are always merged into the **"dev"** branch. If you are willing to contribute, make sure that you are 
 sending us pull requests against the dev branch but not the *master* branch.
@@ -61,17 +66,15 @@ changes easily.
 
 #### In short:
 
-- Features get developed on **feature branches**, either in your local repository or pushed to GitHub. Feature branches
+- Big features get developed on **feature branches**, either in your local repository or pushed to GitHub. Feature branches
 can be rebased.
 - Once ready, **feature branches** are PR'd to **dev**.
-- When the WPFC team wants to make a release, **dev** is branched into a **release branch**. Any necessary stabilization
-work happens there, including final changes and testing; **dev** is never frozen, and efforts to PR in **feature branches**
-should not stop just because a release is happening.
-- When a release is made, the **release branch** is pushed to **master** and **master** is tagged at that point.
-- If hotfixes need to be made, then they can be made on the **release branch**. Anything that also applies to the
-**development branch** is first committed there, then cherry-picked to the **release branch**. The **release branch**
-is then pushed to **master** (again), and tagged (again), going from e.g. 2.10.1 to 2.10.2.
-- **dev**, **master** and the **release branches** are all protected; no rebasing happens there.
-
-(Note: Until 2018-01-19, **release branches** were deleted once they were merged into **master**. That was not a smart move,
-since it would be hard to create a hotfix once there is a significant progress on **dev**.)
+- When the WPFC team wants to make a release, **dev** is branched into a **release branch**. Version gets bumped, necessary
+stabilization work happens, including final changes and testing, on that branch. (**dev** is never frozen, and efforts to PR 
+in **feature branches** should not stop just because a release is happening)
+- When a release is ready to be released, the **release branch** is merged into **dev** & **master**, **master** is tagged 
+at that point.
+- If hotfixes need to be made, then a **hotfix branch** is created from **master** and all necessary fixes are applied on it.
+After the critical bug has been fixed and version has been bumped, **hotfix branch** is merged into **master** and **dev**, 
+and **master** is tagged with at that point. 
+- **dev** and **master** are protected; no rebasing happens there.

assets/css/_import-export.scss

@@ -95,5 +95,22 @@
         margin-top: 1rem;
       }
     }
+
+    .wp-upload-form {
+      display: none;
+    }
+
+    .import-sniper {
+      line-height: 1;
+      vertical-align: middle;
+      width: 13px;
+      display: inline-block;
+      position: relative;
+      top: -1px;
+      display: none;
+      img {
+        max-width: 100%;
+      }
+    }
   }
 }

assets/css/sermon.css

@@ -320,3 +320,178 @@ h3.wpfc_grid_title a {
 .wpfc_worship_audio .wp-playlist {
     border: 0px !important;
 }
+
+/******************************* Sermon Sorting *******************************/
+.wpfc-sermon-container #wpfc_sermon_sorting {
+    padding: 0;
+    margin: 0 0 48px 0;
+}
+
+.wpfc-sermon-container #wpfc_sermon_sorting form {
+    margin: 0;
+}
+
+.wpfc-sermon-container #wpfc_sermon_sorting > div {
+    margin: 0 8px 4px 0;
+}
+
+.wpfc-sermon-container #wpfc_sermon_sorting > div:last-child {
+    margin: 0 0 4px 0;
+}
+
+@media (max-width: 700px) {
+    .wpfc-sermon-container #wpfc_sermon_sorting > div {
+        width: 100%;
+        margin: 0 0 12px 0;
+    }
+
+    .wpfc-sermon-container #wpfc_sermon_sorting > div:last-child {
+        margin: 0;
+    }
+}
+
+/******************************* Sermon Archive *******************************/
+.wpfc-sermon {
+    margin-bottom: 48px;
+}
+.wpfc-sermon:last-child {
+    margin-bottom: 0;
+}
+.wpfc-sermon-image {
+    height: auto;
+    position: relative;
+}
+.wpfc-sermon-image-img {
+    width: 100%;
+    height: 100%;
+    background-size: cover;
+    background-position: center;
+}
+.wpfc-sermon-inner {
+    background: white;
+    border: 1px solid #ddd;
+}
+.wpfc-sermon.noborder .wpfc-sermon-inner {
+    border: none;
+}
+
+.wpfc-sermon-main {
+    padding: 24px;
+}
+
+.wpfc-sermon-meta-item {
+    font-size: 14px;
+    opacity: .87;
+}
+
+.wpfc-sermon-meta-series {
+    margin: 0 0 8px 0;
+}
+
+.wpfc-sermon-title {
+    margin: 0;
+    padding: 0;
+}
+
+.wpfc-sermon-meta-date {
+    margin: 8px 0 0;
+}
+
+.wpfc-sermon-description {
+    font-size: 14px;
+    margin: 8px 0 0;
+}
+
+.wpfc-sermon-description p {
+    margin: 0 0 12px 0;
+}
+
+.wpfc-sermon-description p:last-child {
+    margin: 0;
+}
+
+.wpfc-sermon-footer {
+    margin-top: 24px;
+    padding-top: 24px;
+    border-top: 1px solid #ddd;
+}
+
+.wpfc-sermon-footer .wpfc-sermon-meta-item {
+    display: inline-block;
+    position: relative;
+}
+
+.wpfc-sermon-footer .wpfc-sermon-meta-item:not(:last-child):after {
+    content: '|';
+    padding: 0 4px;
+    color: #ddd;
+}
+
+/* Horizontal View */
+@media (min-width: 800px) {
+    .wpfc-sermon-inner {
+        display: flex;
+        flex-flow: row wrap;
+    }
+    .wpfc-sermon-image { flex: 0 30%; }
+    .wpfc-sermon-main { flex: 1; }
+}
+
+@media(max-width: 800px) {
+    .wpfc-sermon-image-img {
+        padding-top: 56.25%;
+    }
+}
+
+/******************************* Sermon Singular *******************************/
+.wpfc-sermon-single-image {
+    margin-bottom: 24px;
+}
+.wpfc-sermon-single-image img {
+    display: block;
+    max-width: 100%;
+    width: 100%;
+}
+.wpfc-sermon-single-header,
+.wpfc-sermon-single-media {
+    text-align: center;
+}
+.wpfc-sermon-single-header .wpfc-sermon-single-meta-item {
+    font-size: 14px;
+    opacity: .87;
+}
+.wpfc-sermon-single-meta-date {
+    margin-bottom: 8px;
+}
+.wpfc-sermon-single-title {
+    margin: 0;
+    padding: 0;
+}
+.wpfc-sermon-single-meta {
+    margin: 8px -8px 0 -8px;
+}
+.wpfc-sermon-single-meta-item {
+    display: inline-block;
+    margin: 0 8px;
+}
+.wpfc-sermon-single-media > div {
+    margin: 24px 0;
+}
+.wpfc-sermon-single-description {
+    margin-top: 24px;
+}
+.wpfc-sermon-single-description p:first-child {
+    margin-top: 0;
+}
+.wpfc-sermon-single-description p:last-child {
+    margin-bottom: 0;
+}
+.wpfc-sermon-single-attachments {
+    background: #efefef;
+    border: 1px solid #ddd;
+    padding: 24px;
+    margin-top: 24px;
+}
+.wpfc-sermon-single-topics {
+    margin-top: 24px;
+}

assets/css/theme-specific/twentrythirteen.css

@@ -0,0 +1,13 @@
+.wpfc-twentythirteen {
+    margin: 0 auto;
+    max-width: 604px;
+    width: 100%;
+}
+
+#wpfc_sermon_sorting {
+    margin: 40px 0 0 !important;
+}
+
+.wpfc-sermon {
+    margin: 0;
+}