Skip to content

Commit

Permalink
Merge pull request #36 from subutai-io/dev
Browse files Browse the repository at this point in the history
Upgrade to 3.0.0 and minor fixes
  • Loading branch information
zubaidullo authored Sep 25, 2017
2 parents 8df41fa + df3e4be commit 867578a
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "porto",
"version": "2.0.14",
"version": "3.0.0",
"description": "Porto is a browser extension library for Google Chrome,Firefox and Safari that allows to develop cross platform browser extension with ease.",
"license": "ALS",
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "__MSG_ext_name__",
"version": "2.0.14",
"version_name": "2.0.14",
"version": "3.0.0",
"version_name": "3.0.0",
"description": "__MSG_ext_description__",
"homepage_url":"https://subutai.io",
"manifest_version": 2,
Expand Down
2 changes: 1 addition & 1 deletion common/res/defaults.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.0.14",
"version": "3.0.0",
"watch_list": [
{
"active": true,
Expand Down
2 changes: 1 addition & 1 deletion common/ui/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a href="https://subutai.io" rel="noreferrer" target="_blank"
class="btn popupLogo btn-link btn-xs"></a><br>
<a data-placement="bottom" data-toggle="tooltip"
href="https://github.com/subutai-io/Tooling-pgp-plugin/wiki" target="_blank" rel="noreferrer"
href="https://github.com/subutai-io/browsers/wiki" target="_blank" rel="noreferrer"
class="btn btn-link btn-sm pull-right" data-l10n-title-id="popup_help_tooltip">
<span class="glyphicon glyphicon-question-sign"></span><span data-l10n-id="popup_help"></span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/client-api/Readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Basic Usage

The Mailvelope extension injects a script into the page to make its client-api accessible.
The `window.mailvelope` object will be an instance of the [Mailvelope](Mailvelope.html) class, please refer to its methods for further documentation.
The `window.mailvelope` object will be an instance of the Mailvelope class, please refer to its methods for further documentation.

## Events

Expand Down
4 changes: 2 additions & 2 deletions e2e-plugin.safariextension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
<string>2.0.14</string>
<string>3.0.0</string>
<key>CFBundleVersion</key>
<string>2.0.14</string>
<string>3.0.0</string>
<key>Chrome</key>
<dict>
<key>Global Page</key>
Expand Down
2 changes: 1 addition & 1 deletion firefox/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "e2e-plugin",
"title": "Subutai E2E Plugin",
"version": "2.0.14",
"version": "3.0.0",
"fullName": "Subutai E2E Plugin",
"id": "jid1-DejrJUD3AaPCkw@jetpack",
"description": "Security is utterly important in Subutai and this plugin helps keep you and your cloud secure. We use encryption, digital signatures, and keys all over the place. Even simple things you do involve complicated security operations behind the scenes. One of most important principles is to make sure your keys for performing these tasks are never transferred or taken off your computer to get into the wrong hands. To help enforce this, we have to make sure everything transferred is encrypted, or signed end-to-end. We also don't want to slow and weigh you down with complicated things you would have to do manually without this plugin. The complexity could lead to a mistake if you had to do some things manually and that would greatly reduce security.\n The Subutai E2E plugin works on your computer with your browser to manage the keys to your cloud environments. It works with Subutai and the Hub to perform complicated tasks seamlessly for you. These keys are never exposed, or transferred, always staying right where they were created and protected by a passcode. In the future, the plugin will interoperate with USB hardware security modules to not even store keys on your computer and allow them to move around with you and your USB device.",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "subutai",
"version": "2.0.14",
"version": "3.0.0",
"description": "Subutai E2E Plugin",
"scripts": {
"test": "grunt test"
Expand Down

0 comments on commit 867578a

Please sign in to comment.