Merge pull request #112 from guyht/version/1.13

Version 1.13

CHANGELOG.md

@@ -5,7 +5,7 @@ Changelog
 * vimari now exists as a Safari App Extension, making it compatible with Safari
   version 12
 
-### 1.13.0 (4/12/2017)
+### 1.13.0 (16/8/2018)
 * New fresh icon
 * Removed shift as default modifier key
 * 't' now opens new tab

Makefile

@@ -1,10 +1,15 @@
-.PHONY: all test
+.PHONY: all test test-watch
 
-all:
-	npm install
+NPM=$(shell which npm)
+NPM_BIN=$(shell npm bin)
+
+all: deps
+
+deps:
+	@$(NPM) install
 
 test:
-	./node_modules/.bin/jest tests
+	@$(NPM_BIN)/jest tests
 
 test-watch:
-	./node_modules/.bin/jest --watch tests
+	@$(NPM_BIN)/jest --watch tests

README.md

@@ -1,35 +1,39 @@
-Vimari - Keyboard Shortcuts extension for Safari
-================================================
+# Vimari - Keyboard Shortcuts extension for Safari
 
 Vimari is a Safari extension that provides keyboard based navigation.
-The code is heavily based on [vimium](https://github.com/philc/vimium),
-a Chrome extension that provides much more extensive features.
+The code is heavily based on [vimium](https://github.com/philc/vimium), a
+Chrome extension that provides much more extensive features.
 
-Vimari attempts to provide a lightweight port of vimium to Safari,
-taking the best components of vimium and adapting them to Safari.
+Vimari attempts to provide a lightweight port of vimium to Safari, taking the
+best components of vimium and adapting them to Safari.
 
-### Releases
-  - [Version 2.0.0](docs/safari_12.md) (Safari v12)
-  - [Version 1.12](https://github.com/guyht/vimari/releases/tag/v1.12)
-  - [Version 1.11](https://github.com/guyht/vimari/releases/tag/v1.11)
-  - [Version 1.10](https://github.com/guyht/vimari/releases/tag/v1.10)
-  - [Version 1.9](https://github.com/guyht/vimari/releases/tag/v1.9)
+![Screenshot](assets/screenshot.png)
 
-__Installation Instructions__
+## Releases
 
-Click the download link below and double-click the file to get the
-latest version of vimari:
+### Safari 12
+ - [v2.0.0](docs/safari_12.md)
 
-https://github.com/guyht/vimari/releases/latest
+### Safari 11 and below
+ - [v1.13](https://github.com/guyht/vimari/releases/tag/v1.13)
+ - [v1.12](https://github.com/guyht/vimari/releases/tag/v1.12)
+ - [v1.11](https://github.com/guyht/vimari/releases/tag/v1.11)
+ - [v1.10](https://github.com/guyht/vimari/releases/tag/v1.10)
+ - [v1.9](https://github.com/guyht/vimari/releases/tag/v1.9)
 
+## Installation
 
-Screenshot
------------
+### Safari 12
 
-![Screenshot](https://github.com/guyht/vimari/raw/gh-pages/shot.png)
+Read [this guide](docs/safari_12.md).
 
-Usage
------
+### Safari 11
+
+[Download the latest
+version](https://github.com/guyht/vimari/releases/tag/v1.13) and double-click
+the file.
+
+## Usage
 
 ### Settings
 **Command Prefix** - Modifier key to hold down with your action key. If
@@ -39,7 +43,7 @@ setting).
 **Excluded URLs** - Comma separated list of website URLs you don't want
 to use vimari with. To exclude GitHub for example, provide the value
 `github.com` or `http://github.com`. It's smart and should handle all
-possible domain cases though.
+possible domain cases.
 
 **Link Hint Characters** - Allowed characters to be used when generating
 link shortcuts.
@@ -76,7 +80,6 @@ settings of the extension. You can find them in
     X       Close current tab and go to right tab
     t       Open new tab
 
-License
--------
-Copyright (c) 2011 Guy Halford-Thompson. See MIT-LICENSE.txt for
-details.
+## License
+
+Copyright (C) 2011 Guy Halford-Thompson. See [LICENSE](LICENSE) for details.

vimari.safariextension/Info.plist

@@ -5,7 +5,7 @@
 	<key>Author</key>
 	<string>Various</string>
 	<key>Builder Version</key>
-	<string>10600.3.18</string>
+	<string>13605.3.8</string>
 	<key>CFBundleDisplayName</key>
 	<string>vimari</string>
 	<key>CFBundleExecutable</key>
@@ -15,9 +15,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.12</string>
+	<string>1.13</string>
 	<key>CFBundleVersion</key>
-	<string>22</string>
+	<string>23</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Global Page</key>
@@ -44,7 +44,7 @@
 	<key>Description</key>
 	<string>Vim style shortcuts for Safari</string>
 	<key>DeveloperIdentifier</key>
-	<string>357AUX7M8L</string>
+	<string>SK24TBMYCC</string>
 	<key>ExtensionInfoDictionaryVersion</key>
 	<string>1.0</string>
 	<key>Permissions</key>