Merge branch 'master' into codeable

Conflicts:
	README.md
	src/manifest.json

CHANGES

@@ -1,3 +1,6 @@
+[0.6.11]
+- HabitRPG to Habitica
+- Enabled extension options page
 [0.6.10]
 - Fixed Teamweek issues
 [0.6.9]

README.md

@@ -47,7 +47,9 @@ Add Toggl one-click time tracking to popular web tools.
   - [BamBam][43]
   - [GQueue][44]
   - [Wrike][45]
-  - [Codeable][46]
+  - [Assembla][46]
+  - [Waffle][47]
+  - [Codeable][48]
 
 ## Installing from the Web Store
 
@@ -70,7 +72,7 @@ List of all the changes and added features can be found at http://toggl.github.i
 [Trello][8], [Worksection][9], [Redbooth][10], [Podio][11], [Basecamp][12], [JIRA][13], [Producteev][14],
 [Bitbucket][15], [Stifer][16], [Google Docs][17], [Redmine][18], [YouTrack][19], [CapsuleCRM][20],
 [Xero][21], [Zendesk][22], [Any.do][23], [Todoist][24], [Trac][25], [Wunderlist][26], [Toodledo][27],
-[Teamwork.com][28], [Google Mail][29], [Taiga][30], [HabitRPG][31], [Axosoft][32], [Countersoft Gemini][33], [Drupal][34], [Esa][35], [Help Scout][36], [Flow][37], [Sprintly][38], [Google Calendar][39], [TestRail][40], [Bugzilla][41], [Breeze][42], [BamBam][43], [GQueue][44], [Wrike][45], [Codeable][46] account and start your Toggl timer there.
+[Teamwork.com][28], [Google Mail][29], [Taiga][30], [HabitRPG][31], [Axosoft][32], [Countersoft Gemini][33], [Drupal][34], [Esa][35], [Help Scout][36], [Flow][37], [Sprintly][38], [Google Calendar][39], [TestRail][40], [Bugzilla][41], [Breeze][42], [BamBam][43], [GQueue][44], [Wrike][45], [Assembla][46], [Waffle][47], [Codeable][46] account and start your Toggl timer there.
 
 3.  To stop the current running timer:
   - press the button again
@@ -130,6 +132,8 @@ Don't know how to start? Just check out the [user requested services][97] that h
 [43]: https://www.dobambam.com/
 [44]: https://www.gqueues.com/
 [45]: https://www.wrike.com/
+[46]: https://www.assembla.com/
+[47]: https://waffle.io/
 [46]: https://www.codeable.io/
 
 [97]: https://github.com/toggl/toggl-button/wiki/User-requested-buttons

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Toggl Button",
   "short_name": "Toggl Button",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "manifest_version": 2,
   "description": "Add Official Toggl Online Timer to Popular Web Tools",
   "background": {
@@ -58,12 +58,13 @@
     "*://*.wunderlist.com/*",
     "*://*.teamwork.com/*",
     "*://*.teamworkpm.net/*",
-    "*://*.habitrpg.com/*",
+    "*://*.habitica.com/*",
     "*://*.taiga.io/*",
     "*://*.axosoft.com/*",
     "*://*.ongemini.com/*",
     "*://*.drupal.org/*",
     "*://*.esa.io/*",
+    "*://waffle.io/*",
     "*://secure.helpscout.net/*",
     "*://*.getflow.com/*",
     "*://sprint.ly/*",
@@ -73,13 +74,15 @@
     "*://*.dobambam.com/*",
     "*://app.breeze.pm/*",
     "*://www.gqueues.com/*",
-    "*://app.codeable.io/*"
+    "*://app.codeable.io/*",
+    "*://www.assembla.com/*"
   ],
   "icons": {
     "16": "images/icon-16.png",
     "48": "images/icon-48.png",
     "128": "images/icon-128.png"
   },
+  "options_page": "html/settings.html",
   "content_scripts": [
     {
       "matches": [
@@ -122,7 +125,7 @@
         "*://*.teamwork.com/*",
         "*://*.teamworkpm.net/*",
         "*://mail.google.com/*",
-        "*://*.habitrpg.com/*",
+        "*://*.habitica.com/*",
         "*://*.taiga.io/*",
         "*://*.axosoft.com/*",
         "*://*.ongemini.com/*",
@@ -137,7 +140,9 @@
         "*://*.dobambam.com/*",
         "*://app.breeze.pm/*",
         "*://www.gqueues.com/*",
-        "*://app.codeable.io/*"
+        "*://app.codeable.io/*",
+        "*://waffle.io/*",
+        "*://www.assembla.com/*"
       ],
       "css": ["styles/style.css"],
       "js": ["scripts/common.js"]
@@ -284,7 +289,7 @@
       "js": ["scripts/content/google-mail.js"]
     },
     {
-      "matches": ["*://*.habitrpg.com/*"],
+      "matches": ["*://*.habitica.com/*"],
       "js": ["scripts/content/habitrpg.js"]
     },
     {
@@ -346,6 +351,14 @@
     {
       "matches": ["*://app.codeable.io/*"],
       "js": ["scripts/content/codeable.js"]
+    },
+    {
+      "matches": ["*://waffle.io/*"] ,
+      "js": ["scripts/content/waffle.io.js"]
+    },
+    {
+      "matches": ["*://www.assembla.com/*"],
+      "js": ["scripts/content/assembla.js"]
     }
   ]
 }

src/scripts/content/assembla.js

@@ -0,0 +1,20 @@
+/*jslint indent: 2, unparam: true*/
+/*global $: false, document: false, togglbutton: false, createTag: false*/
+'use strict';
+
+togglbutton.render('#tickets-show:not(.toggl)', {}, function (elem) {
+
+  var link,
+    container = createTag('li', 'toggle-container'),
+    description = $('span.ticket-number', elem).textContent + ' ' + $('.ticket-summary > h1').textContent,
+    project = $('h1.header-w > span').textContent;
+
+  link = togglbutton.createTimerLink({
+    className: 'assembla',
+    description: description,
+    projectName: project,
+  });
+
+  container.appendChild(link);
+  $('ul.menu-submenu').appendChild(container);
+});

src/scripts/content/waffle.io.js

@@ -0,0 +1,18 @@
+/*jslint indent: 2, unparam: true*/
+/*global $: false, document: false, togglbutton: false*/
+'use strict';
+
+togglbutton.render('.comments-number:not(.toggl)',  {observe: true}, function (elem) {
+
+  var link, description;
+
+  description = '#' + $('.issue-number').textContent + ' ' + $('.issue-title').textContent;
+
+  link = togglbutton.createTimerLink({
+    className: 'waffle-io',
+    description: description
+  });
+
+
+  elem.appendChild(link);
+});