Merge branch 'master' into prowork

Conflicts:
	src/manifest.json

AUTHORS

@@ -0,0 +1,76 @@
+IndrekV <[email protected]>
+Tambet Masik <[email protected]>
+Steve Shaffer <[email protected]>
+nnpro <[email protected]>
+Vladyslav Sitalo <[email protected]>
+Daniel Holzmann <[email protected]>
+dpashkevich <[email protected]>
+Indrek V <[email protected]>
+Sepehr Lajevardi <[email protected]>
+Gábor Egyed <[email protected]>
+miki131 <[email protected]>
+Shai Rubinshtein <[email protected]>
+Elan Ruusamäe <[email protected]>
+nakamura <[email protected]>
+Garrett Wolf <[email protected]>
+Sergey Ivanov <[email protected]>
+Mark Pavlitski <[email protected]>
+Victor Shih <[email protected]>
+Remigiusz Dymecki <[email protected]>
+David da Silva <[email protected]>
+davi-aquarii <[email protected]>
+ben hockey <[email protected]>
+Serge <[email protected]>
+Sascha Schuenemann <[email protected]>
+Ricardo Sateler <[email protected]>
+Mike Carter <[email protected]>
+Leandro Voltolino <[email protected]>
+Ke Hu <[email protected]>
+Juan Ferreras <[email protected]>
+Dan <[email protected]>
+Cooper Maruyama <[email protected]>
+BudgieInWA <[email protected]>
+Ayman Bedair <[email protected]>
+paladiy <[email protected]>
+iwozzy <[email protected]>
+Vladimir Lyzo <[email protected]>
+Rodrigo Lopez Guerra <[email protected]>
+Michal Miškerník <[email protected]>
+Josh Davies <[email protected]>
+John B. Lee <[email protected]>
+Jesús Espino <[email protected]>
+Janika <[email protected]>
+Jamon Holmgren <[email protected]>
+James Douglass <[email protected]>
+Itai Nathaniel <[email protected]>
+Harm Hermsen <[email protected]>
+Flamur Mavraj <[email protected]>
+David da Silva Contin <[email protected]>
+Christian Seel <[email protected]>
+yamadapc <[email protected]>
+vwxyz <[email protected]>
+to0namiSB <[email protected]>
+sfarbota <[email protected]>
+polidog <[email protected]>
+glennpegden <[email protected]>
+Taylor J. Meek <[email protected]>
+Silberwoelfin <[email protected]>
+Saar Cohen <[email protected]>
+Romuald Bulyshko <[email protected]>
+Roman Imankulov <[email protected]>
+Rob Carlson <[email protected]>
+Oleg Ermakov <[email protected]>
+Mohamed Gaber <[email protected]>
+Michal Krejčí <[email protected]>
+Matt Glaman <[email protected]>
+Lars Daniel Rasmussen <[email protected]>
+KamilKopaczyk <[email protected]>
+Josh Davies <[email protected]>
+Jan Beck <[email protected]>
+Florian Meyer <[email protected]>
+Ervin <[email protected]>
+Emily Morehouse <[email protected]>
+David Barley <[email protected]>
+Daniel Mackey <[email protected]>
+Alejandro Alonso <[email protected]>
+Achim Wolf Sperling <[email protected]>

CHANGES

@@ -1,3 +1,36 @@
+[0.8.3]
+- Fixed toggl.com url matching
+- Smaller fixes and tweaks
+[0.8.2]
+- Fixed escaping issues when saving tag
+- Added possibility to know if user has button installed while on toggl.com webpage
+[0.8.1]
+- Fixed card coping issue in Trello
+- Updated extension name and description
+- Default tracking reminder time is 60 minutes
+- Improved user data fetching
+[0.8.0]
+- Fixed Pomodoro timer sound issues
+- Updated Trello start time link to match Trello styles
+- Added "Total time tracked" to Trello cards
+[0.7.9]
+- Improved error messages text
+- Fixes for Todoist text fetching
+- Smaller bug fixes
+[0.7.8]
+- Improved settings managment
+- Show "Continue latest" option in Tracking reminder
+- Fixed updating extension icon when logging out
+- Added tabs to settings view
+- Unified input fields design in settings
+- Added animation to subsettings open/close
+- Show error message when time entry start fails
+- Fixed Toggl Button rendering in updated gitlab design
+- Added support for BitBucket pull requests
+- Fixes for Assembla updates
+- Improved Todoist description text fetching
+- Fixed edit form clear issue in dropdown
+- Fixed browser autocomplete issue in dropdown
 [0.7.7]
 - Fixed continuing latest entry with task from Pomodoro notification
 - Added failsafe for starting websocket

Makefile

@@ -8,8 +8,11 @@ node_modules/.bin/jslint:
 
 dist: clean
 	@if [ ! -d "out" ]; then mkdir -p out; fi
-	@cp -R src/manifest.json src/images src/scripts src/styles src/html out/
+	@cp -R src/manifest.json src/images src/scripts src/styles src/html src/sounds out/
 	@zip -q -r toggl-button out && rm -rf out
 
 clean:
 	@if [ -f "toggl-button.zip" ]; then rm toggl-button.zip; fi
+
+authors:
+	git log --all --format='%aN <%cE>' | sort -u > AUTHORS

README.md

@@ -54,6 +54,27 @@ Add Toggl one-click time tracking to popular web tools.
   - [Salesforce][50]
   - [Draftin][51]
   - [FogBugz][52]
+  - [Google Keep][53]
+  - [Gingko][54]
+  - [Google Inbox][55]
+  - [Wordpress][56]
+  - [Kanbanery][57]
+  - [Planbox][58]
+  - [Zoho Books][59]
+  - [Slack][60]
+  - [Doit.im][61]
+  - [Sunrise Calendar][62]
+  - [Cloudes][63]
+  - [eProject.me][64]
+  - [Freshdesk][65]
+  - [Newsletter2Go][66]
+  - [Gogs][67]
+  - [DevDocs][68]
+  - [LiquidPlanner][69]
+  - [SourceLair][70]
+  - [Remember The Milk][71]
+  - [Evernote][72]
+  - [MantisHub][73]
 
 ## Installing from the Web Store
 
@@ -75,7 +96,7 @@ List of all the changes and added features can be found at http://toggl.github.i
 2.  Go to your [TeamWeek][2], [Pivotal Tracker][3], [Github][4], [Asana][5], [Unfuddle][6], [Gitlab][7],
 [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], [Assembla][46], [Waffle][47], [Codeable][48], [Eventum][49], [Salesforce][50], [Draftin][51], [FogBugz][52] account and start your Toggl timer there.
+[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], [Assembla][46], [Waffle][47], [Codeable][48], [Eventum][49], [Salesforce][50], [Draftin][51], [FogBugz][52], [Google Keep][53], [Gingko][54], [Google Inbox][55], [Wordpress][56], [Kanbanery][57], [Planbox][58], [Zoho Books][59], [Slack][60], [Doit.im][61], [Sunrise Calendar][62], [Cloudes][63], [eProject.me][64], [Freshdesk][65], [Newsletter2Go][66], [Gogs][67], [DevDocs][68], [LiquidPlanner][69], [SourceLair][70], [Remember The Milk][71], [Evernote][72], [MantisHub][73] account and start your Toggl timer there.
 
 Or start entry from the extension icon menu
 
@@ -95,6 +116,8 @@ If you use a setup, where one of the supported services is on a custom domain yo
 ## Contributing
 Want to contribute? Great! Just fork the project, make your changes and open a [Pull Request][99]
 
+When adding new integrations please use `git squash` and merge all your commits into one commit. This keeps the git log more compact and clear.
+
 Don't know how to start? Just check out the [user requested services][97] that have not yet been implemented, pick one and start hacking.
 
 [1]: https://www.toggl.com/
@@ -149,6 +172,27 @@ Don't know how to start? Just check out the [user requested services][97] that h
 [50]: http://www.salesforce.com/
 [51]: https://draftin.com/
 [52]: http://www.fogcreek.com/fogbugz/
+[53]: https://keep.google.com/
+[54]: https://gingkoapp.com/
+[55]: https://inbox.google.com
+[56]: https://wordpress.com
+[57]: https://www.kanbanery.com/
+[58]: http://www.planbox.com/
+[59]: https://books.zoho.com/
+[60]: https://slack.com/
+[61]: https://i.doit.im/
+[62]: https://calendar.sunrise.am
+[63]: http://cloudes.me/
+[64]: https://eproject.me/
+[65]: https://www.freshdesk.com/
+[66]: http://www.newsletter2go.com/
+[67]: http://gogs.io/
+[68]: http://devdocs.io/
+[69]: https://www.liquidplanner.com/
+[70]: https://www.sourcelair.com/
+[71]: https://www.rememberthemilk.com/
+[72]: https://www.evernote.com/
+[73]: http://www.mantishub.com/
 
 [97]: https://github.com/toggl/toggl-button/wiki/User-requested-buttons
 [98]: https://github.com/toggl/toggl-button/wiki/Adding-custom-domains

src/html/popup.html

@@ -7,8 +7,11 @@
   <body>
     <div class="header" title="Open Toggl.com"></div>
     <div class="user-email" title="Open profile at Toggl.com"></div>
-
-    <ul class="menu view">   
+    <div class="error"></div>
+    <ul class="menu view">
+      <li class='resume-button-container'>
+        <button class="resume-button">Continue latest</button>
+      </li>
       <li>
         <div class="project-bullet"></div>
         <div class="edit-button"></div>

src/html/settings.html

@@ -4,60 +4,78 @@
     <title>Toggl Button - Settings</title>
     <link rel="stylesheet" href="../styles/settings.css"/>
   </head>
+  <header>
+    <ul class="tab-links">
+      <li class="tab-link active" data-tab="1">General</li>
+      <li class="tab-link" data-tab="2">Pomodoro Timer</li>
+    <!--li class="tab-link" data-tab="3">Permissions</li-->
+    </ul>
+  </header>
   <body>
     <div class="container">
-      <ul class="list">
-        <li>
-          <input type="checkbox" id="show_post_start_popup">
-          <label for="show_post_start_popup">Show post-start popup</label>
-          <div class="description">Opens up edit form right after clicking "Start timer" link</div>
-        </li>
-        <li>
-          <input type="checkbox" id="websocket">
-          <label for="websocket">Live updates (websocket)</label>
-          <div class="description">Keeps Toggl Button up to date. All updates should arrive in seconds.</div>
-        </li>
-        <li class="nag-nanny">
-          <input type="checkbox" id="nag-nanny">
-          <label for="nag-nanny">Remind me to track</label>
-          <p class="description">Shows reminder notification if user has forgot to start timer while working</p>
-          <div class="subsettings-details">
-            <span>Track activity on workdays</span>
-            <p>
-              <label for="nag-nanny-from">From:</label>
-              <input type="time" id="nag-nanny-from">
-            </p>
-            <p>
-              <label for="nag-nanny-to">To:</label>
-              <input type="time" id="nag-nanny-to">
-            </p>
-            <p>
-              <label for="nag-nanny-interval">Minutes since stopping last Time Entry</label>
-              <input type="number" id="nag-nanny-interval" min="1">
-            </p>
-          </div>
-        </li>
-        <li class="discard-notification">
-          <input type="checkbox" id="idle-detection">
-          <label for="discard-notification">Idle detection</label>
-          <div class="description">Shows notification when timer was tracking but user has been idle and allows to discard idle time</div>
-        </li>
-        <li class="pomodoro-mode">
-          <input type="checkbox" id="pomodoro-mode">
-          <label for="pomodoro-mode">Enable Pomodoro mode</label>
-          <p class="description">Allows user to define Pomodoro Timer interval. Pomodoro timer start running every time time entry is started. At the end of the interval the timer is stopped and user is shown notification to take a break</p>
-          <div class="subsettings-details">
-            <p>
-              <input type="checkbox" id="enable-sound-signal">
-              <label for="enable-sound-signal">Enable sound notification at the end of an interval</label>
-            </p>
-            <p>
-              <label for="pomodoro-interval">Length of Pomodoro time interval in minutes</label>
-              <input type="number" id="pomodoro-interval" min="1">
-            </p>
-          </div>
-        </li>
-      </ul>
+      <div class="tab tab-1 active">
+        <ul class="list">
+          <li>
+            <input type="checkbox" id="show_right_click_button">
+            <label for="show_right_click_button">Show button in right click menu</label>
+            <div class="description">Shows a "Start timer" button in the right click menu</div>
+          </li>
+          <li>
+            <input type="checkbox" id="show_post_start_popup">
+            <label for="show_post_start_popup">Show post-start popup</label>
+            <div class="description">Opens up edit form right after clicking "Start timer" link</div>
+          </li>
+          <li>
+            <input type="checkbox" id="websocket">
+            <label for="websocket">Live updates (websocket)</label>
+            <div class="description">Keeps Toggl Button up to date. All updates should arrive in seconds.</div>
+          </li>
+          <li class="nag-nanny">
+            <input type="checkbox" id="nag-nanny">
+            <label for="nag-nanny">Remind me to track</label>
+            <p class="description">Shows reminder notification if user has forgot to start timer while working</p>
+            <div class="subsettings-details">
+              <span>Track activity on workdays</span>
+              <p>
+                <label for="nag-nanny-from">From:</label>
+                <input type="time" id="nag-nanny-from">
+              </p>
+              <p>
+                <label for="nag-nanny-to">To:</label>
+                <input type="time" id="nag-nanny-to">
+              </p>
+              <p>
+                <label for="nag-nanny-interval">Minutes since stopping last Time Entry</label>
+                <input type="number" id="nag-nanny-interval" min="1">
+              </p>
+            </div>
+          </li>
+          <li class="discard-notification">
+            <input type="checkbox" id="idle-detection">
+            <label for="discard-notification">Idle detection</label>
+            <div class="description">Shows notification when timer was tracking but user has been idle and allows to discard idle time</div>
+          </li>
+        </ul>
+      </div>
+      <div class="tab tab-2">
+        <ul class="list">
+          <li class="pomodoro-mode">
+            <input type="checkbox" id="pomodoro-mode">
+            <label for="pomodoro-mode">Enable Pomodoro mode</label>
+            <p class="description">Allows user to define Pomodoro Timer interval. Pomodoro timer starts running every time a time entry is started. At the end of the interval the timer is stopped and user is shown notification to take a break</p>
+            <div class="subsettings-details">
+              <p>
+                <input type="checkbox" id="enable-sound-signal">
+                <label for="enable-sound-signal">Enable sound notification at the end of an interval</label>
+              </p>
+              <p>
+                <label for="pomodoro-interval">Length of Pomodoro time interval in minutes</label>
+                <input type="number" id="pomodoro-interval" min="1">
+              </p>
+            </div>
+          </li>
+        <ul>
+      </div>
       <p class="changelog">Change log: <a href="http://toggl.github.io/toggl-button">http://toggl.github.io/toggl-button</a></p>
     </div>
     <div class="footer">