Merge pull request #17 from dragouf/development_stash

bug fix: help in options panel was incorrect

README.md

@@ -5,7 +5,7 @@ Stash Reviewers Groups - Extension
 <img src="https://raw.githubusercontent.com/dragouf/Stash-Reviewers-Chrome-Extension/stash-server-version/docs/launch.png" alt="extension art" />
 </p>
 
->:warning: if you have bitbucket server (last version of stash) please switch to 'bitbucket-server-version' branch
+>:warning: if you have bitbucket server (last version of stash) please switch to 'master' branch
 
 This chrome/firefox extension allow to define groups of reviewers in Atlassian Stash to bulk add them when creating or updating pull request.
 
@@ -21,10 +21,10 @@ This chrome/firefox extension allow to define groups of reviewers in Atlassian S
     * Highlight disappear when you visit the related PR page
     * Highlight state is save on the localStorage
     * Note: there is 2 kind of highlight: strong blue is when you see it for the first time (open panel for the first time), light blue is when activity was already there when you opened panel previously.
-* Add filter to the PR list 
+* Add filter to the PR list
     * filter by: Author, Reviewers, Participants (people who participate to the PR even if they are not reviewers), Approvers (PR approved by specific reviewers), Direction, Branch
-    * Note: each filter is a AND per PR and not a OR. 
-    * It mean that you can add only one Author or you will get no result (since there is only one author by PR). 
+    * Note: each filter is a AND per PR and not a OR.
+    * It mean that you can add only one Author or you will get no result (since there is only one author by PR).
     * And ALL reviewers/participants/approvers must exist in the PR or it won't be display
 * Add highlighted header to outdated file in pull request details page instead of the small sticker on the right to improve readability
 * Add clickable branch text (origin and target) in the pull request details page to go to the corresponding repository easily
@@ -36,7 +36,7 @@ This chrome/firefox extension allow to define groups of reviewers in Atlassian S
 * Check for new version
 * Settings
     * user can choose features to enable/disable inside extension option
-    * user can choose to receive desktop notification only for comments on his PR, mention or answer. 
+    * user can choose to receive desktop notification only for comments on his PR, mention or answer.
     * user can map a repository name to a specific name to match his remote name in git
 
 ### Installation
@@ -47,13 +47,13 @@ you can find this extension on chrome webstore here: https://chrome.google.com/w
 OR from the code source of this repository:
 
 - clone this repository
-- Go to chrome settings->extensions (extension manager) 
+- Go to chrome settings->extensions (extension manager)
 - Check the "Developer Mode" checkbox
 - Click on "Load unpacked extension" button.
 - From there choose the extension/chrome/src folder of this repository.
 
 #### Firefox (webextensions)
-- download last .xpi (according to version number) from extension/firefox/dist/ 
+- download last .xpi (according to version number) from extension/firefox/dist/
 - go to extensions panel and click on the tools icon on the right next to the search field and select : Install add-on from file.
 - then browse extension/firefox/dist and select the xpi file.
 
@@ -72,13 +72,13 @@ A "Stash" icon will appear on the top right corner of chrome window. Click on it
 Json format is as follow :
 
 ```
-{ "groups": [ { 
-    "groupName":"first group name", 
-    "reviewers": ["first reviewer name or email"] 
+{ "groups": [ {
+    "groupName":"first group name",
+    "reviewers": ["first reviewer name or email"]
   },
-  { 
-    "groupName":"second group name", 
-    "reviewers": ["first reviewer name or email", "second reviewer name or email"] 
+  {
+    "groupName":"second group name",
+    "reviewers": ["first reviewer name or email", "second reviewer name or email"]
   } ] }
 ```
 
@@ -87,4 +87,3 @@ After that when you will go to pull request creation page or update page a dropd
 ![GitHub Logo](/docs/add_group.png)
 
 **Note**: the extension will make a stash api request to find reviewers. It will simply send the string you added in the reviewers array as search term. Normally if you add email or username as recommanded API should return only one user. You can also enter a name but in this case if the API return more than one user, only the first one will be added.
-

extension/chrome/src/js/injector_loader.js

@@ -22,7 +22,7 @@ function injectEngine(){
 			console.warn("reviewers plugin: no data");
 			var code = ["require('aui/flag')({",
 							"type: 'info',",
-							"title: 'Bitbucket Browser Extension',",
+							"title: 'Stash Browser Extension',",
 							"body: '<p>Please define groups for button to appear</p>',",
 							"close: 'auto'",
 						"});"].join('\n');

extension/chrome/src/js/template.txt

@@ -1 +1 @@
-Please edit this template in bitbucket extension options
+Please edit this template in stash extension options

extension/chrome/src/manifest.json

@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 	"name": "Stash Extension",
 	"description": "Allow to add group of reviewers for pull request in stash + other features",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"permissions": [
 		"storage",
 		"alarms",

extension/chrome/src/popup.html

@@ -5,7 +5,7 @@
 	<meta name="description" content="Stash Reviewers Groups">
 	<meta name="author" content="David LAURENT">
 
-	<title>Bitbucket Reviewers Groups</title>
+	<title>Stash Reviewers Groups</title>
 
 	<!-- Scripts -->
 	<script src="js/jquery-2.0.3.min.js"></script>
@@ -273,7 +273,7 @@
 
 				<div class="row bottom-margin">
 					<div class="col-xs-6">
-						<label for="f_prtemplate" data-toggle="popover">Check new version</label>
+						<label for="f_checkversion" data-toggle="popover">Check new version</label>
 					</div>
 					<div class="col-xs-6">
 						<div class="btn-group" data-toggle="buttons" id="f_checkversion">

history

@@ -1,3 +1,8 @@
+1.6.1
+===================
+- bug fix: help in options panel was incorrect
+- remove reference to bitbucket
+
 1.6.0
 ===================
 - add version check (user is notified when a new version is committed to github)

version

@@ -1 +1 @@
-1.6.0
+1.6.1