Merge branch 'dev' of https://bitbucket.org/Stigmat/chrome_extension into release

Stigmatoz · Stigmatoz · commit f99efe2a77f7 · 2019-02-01T23:12:00.000+03:00
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
 <head>
    <meta charset="utf-8">
-   <title>WebActivity Time Tracker</title>
+   <title>Web Activity Time Tracker</title>
    <link href="style/webact.css" rel="stylesheet" />
    <link href="style/chart.css" rel="stylesheet" />
    <script src="scripts/chart/d3.v4.min.js"></script>
diff --git a/manifest.json b/manifest.json
@@ -1,8 +1,8 @@
 {
         "manifest_version": 2,
     
-        "name": "WebActivity Time Tracker",
-        "short_name": "WebActivity",
+        "name": "Web Activity Time Tracker",
+        "short_name": "Web Activity",
         "version": "0.6.0",
 
         "minimum_chrome_version": "26",
@@ -35,7 +35,7 @@
         },
         "browser_action": {
             "default_popup": "index.html",
-            "default_title": "WebActivity Time Tracker",
+            "default_title": "Web Activity Time Tracker",
             "default_icon": "icons/48x48.png"
         }
 }
diff --git a/options.html b/options.html
@@ -3,7 +3,7 @@
 
 <head>
    <meta charset="utf-8">
-   <title>WebActivity Time Tracker</title>
+   <title>Web Activity Time Tracker</title>
    <link href="style/settings.css" rel="stylesheet" />
    <script src="scripts/common.js"></script>
    <script src="scripts/storage.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"manifest_version": 2,`
`3`	`3`
`4`		`- "name": "WebActivity Time Tracker",`
`5`		`- "short_name": "WebActivity",`
	`4`	`+ "name": "Web Activity Time Tracker",`
	`5`	`+ "short_name": "Web Activity",`
`6`	`6`	`"version": "0.6.0",`
`7`	`7`
`8`	`8`	`"minimum_chrome_version": "26",`
`@@ -35,7 +35,7 @@`
`35`	`35`	`},`
`36`	`36`	`"browser_action": {`
`37`	`37`	`"default_popup": "index.html",`
`38`		`- "default_title": "WebActivity Time Tracker",`
	`38`	`+ "default_title": "Web Activity Time Tracker",`
`39`	`39`	`"default_icon": "icons/48x48.png"`
`40`	`40`	`}`
`41`	`41`	`}`