Merge branch 'release/2.1.1'

cyberbit · Aug 23, 2015 · 337b880 · 337b880
2 parents 2b683ae + 867a7b1
commit 337b880
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 17 deletions.
diff --git a/couscous.yml b/couscous.yml
@@ -1,9 +1,13 @@
 template:
     directory: website
 
+exclude:
+    - src
+    - rel
+
 #Variables
 title: Modation
-version: "2.1"
+version: "2.1.1"
 tagline: Soundation, amplified.
 author: cyberbit
 authorLink: https://github.com/cyberbit

diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,24 @@
+---
+layout: docs
+page: Documentation
+---
+
+## Release Process
+1. Check issues on milestone and ensure they are closed, along with the milestone itself.
+2. Draft GitHub release with included changes, under the headers **Spotlight**, **New features**, and **Changes**.
+ > For ordering issue numbers, use the **right-weighted** style:
+ > - \#33, **#43**: Restructured scripts.
+   - \#6, #15, **#45**: Cancelled development on features already built into the new Community structure.
+   - **#52**: Pulled support for multiple accounts.
+   - \#35, **#56**: New project page! http://cyberbit.github.io/modation
+ >
+ > If commit hashes are referenced, list those last:
+ > - \#26, `5b210ab`: Added Soundcloud-style tool tip to user and group links.
+3. Start new `release/x.y(.z)` branch using Git Flow.
+4. Update manifest. Increment version to `x.y` for feature releases, `x.y.z` for fixbag releases.
+5. Compile scripts using Closure. Switch references in manifest and content pages to minified files.
+6. Copy `src` to `rel`. Remove files not applicable to release (i.e., non-minified JS). Commit to release branch.
+7. Load `rel` into development Chrome. If problems are found, fix in `develop` and go back to compile step (5).
+8. Increment version in `couscous.yml`. Copy GitHub release HTML to `whats-new.twig`, using the headers **What's New**, **What's Changed**, and **What's Fixed**. Commit to release branch. Finish release using Git Flow.
+9. Pack and zip project as `project-x.y.z.*`. Add archives to GitHub release, double-check information, and publish release. Tag release merge on `master` with `vx.y.z`.
+10. Upload `.zip` to webstore. Update description and screenshots as needed. Publish to webstore.
diff --git a/rel/background.html b/rel/background.html
@@ -7,6 +7,11 @@
 		<script src="js/moment.min.js"></script>
 		<script src="js/api.min.js"></script>
 		<script src="js/eventPage.min.js"></script>
+
+		<!-- Source -->
+		<!--<script src="js/crapi.js"></script>-->
+		<!--<script src="js/modapi.js"></script>-->
+		<!--<script src="js/eventPage.js"></script>-->
 	</head>
 	<body>
 	</body>

diff --git a/rel/js/content.min.js b/rel/js/content.min.js
diff --git a/rel/manifest.json b/rel/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "Modation",
-	"version": "2.1",
+	"version": "2.1.1",
 
 	"description": "Soundation, amplified.",
 	"icons": { "16": "img/newicon16.png",

diff --git a/src/js/content.js b/src/js/content.js
@@ -277,7 +277,7 @@ function initComments() {
 
 	//Comment box exists
 	if ($writeComment.length) {
-		var $header = $writeComment.siblings("h3");
+		var $header = $writeComment.prevAll("h3").first();
 		var $comments = $writeComment.siblings("div.comments");
 
 		//Set up comments
@@ -308,7 +308,7 @@ function initTracks() {
 
 //Initialize group list
 function initGroups() {
-	var $groupList = $(".group-list");
+	var $groupList = $(".main .group-list");
 	var $groupFilter = _factory(".modation-factory", ".modation-group-filter");
 	var $filter = $groupFilter.find(".filter");
 

diff --git a/src/js/content.min.js b/src/js/content.min.js
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "Modation",
-	"version": "2.1",
+	"version": "2.1.1",
 
 	"description": "Soundation, amplified.",
 	"icons": { "16": "img/newicon16.png",

diff --git a/website/default.twig b/website/default.twig
@@ -2,8 +2,12 @@
 <html lang="en-us">
     <head>
         <meta charset="UTF-8">
-        <title>{{ title }} by {{ author }}</title>
         <meta content="width=device-width, initial-scale=1" name="viewport">
+        <meta name="theme-color" content="#333d45">
+
+        <title>{{ (page) ? page ~ " - " }}{{ title }} by {{ author }}</title>
+
+        <link rel="icon" sizes="192x192" href="img/newiconflat192.png">
         <link href="{{ baseUrl }}/stylesheets/normalize.css" media="screen" rel="stylesheet" type="text/css">
         <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
         <link href="http://fonts.googleapis.com/css?family=Roboto:400,500,700,300,100" rel="stylesheet" type="text/css">
@@ -15,7 +19,18 @@
     </head>
     <body>
         {% block content %}
-            {{ content|raw }}
+            <section class="main-content main">
+                <div class="inner">
+                    {{ content|raw }}
+                </div>
+            </section>
         {% endblock %}
+        <section class="main-content footer">
+            <div class="inner">
+                <footer class="site-footer no-padding">
+                    <span class="site-footer-credits">Made with love by <a href="{{ authorLink }}">{{ author }}</a>.</span>
+                </footer>
+            </div>
+        </section>
     </body>
 </html>
diff --git a/website/docs.twig b/website/docs.twig
@@ -0,0 +1,15 @@
+{% extends "default.twig" %}
+
+{% block content %}
+    <section class="page-header docs">
+        <h1 class="project-name">
+            <img class="img-responsive" src="{{ baseUrl }}/img/newiconflat.png" />
+            {{ title }} Docs <span class="version">v{{ version }}</span>
+        </h1>
+    </section>
+    <section class="main-content main">
+        <div class="inner">
+            {{ content|raw }}
+        </div>
+    </section>
+{% endblock %}
diff --git a/website/home.twig b/website/home.twig
@@ -23,11 +23,4 @@
             {{ content|raw }}
         </div>
     </section>
-    <section class="main-content footer">
-        <div class="inner">
-            <footer class="site-footer no-padding">
-                <span class="site-footer-credits">Made with love by <a href="{{ authorLink }}">{{ author }}</a>.</span>
-            </footer>
-        </div>
-    </section>
 {% endblock %}
diff --git a/website/img/newiconflat192.png b/website/img/newiconflat192.png
diff --git a/website/stylesheets/stylesheet.custom.css b/website/stylesheets/stylesheet.custom.css
@@ -349,6 +349,16 @@ a:hover {
     max-width: 400px
 }
 
+.page-header.docs {
+    padding: 1em;
+}
+
+.page-header.docs .img-responsive {
+    height: 2em;
+    width: 2em;
+    vertical-align: middle;
+}
+
 h1 {
     font-family: "Roboto Slab";
     font-weight: 500

diff --git a/website/whats-new.twig b/website/whats-new.twig
@@ -3,4 +3,9 @@
     <li><a class="issue-link" href="{{ projectUrl }}/issues/44" title="User tagging in comments">#44</a>: Added user tagging in comments (via @).</li>
     <li><a class="issue-link" href="{{ projectUrl }}/issues/59" title="Groups list filtering">#59</a>: Added quick filter to group lists.</li>
     <li><a class="issue-link" href="{{ projectUrl }}/issues/67" title="Show comments box above thread">#67</a>: Moved comments box above thread on tracks and groups.</li>
+</ul>
+<h2><a class="anchor" href="#whats-fixed" id="whats-fixed"><span class="octicon octicon-link"></span></a>What's Fixed</h2>
+<ul>
+    <li><a class="issue-link" href="{{ projectUrl }}/issues/69" title="Group filter appears on track's group list">#69</a>: Fixed group filter appearing on track group lists.</li>
+    <li><a class="issue-link" href="{{ projectUrl }}/issues/70" title="Duplicate comments box on groups">#70</a>: Fixed duplicate comment boxes on groups.</li>
 </ul>