Merge branch 'develop' into release

CHANGELOG.md

@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - PASSBOLT-2419: Remove FF legacy extension support
 - PASSBOLT-2423: Template missing when recovering an account: setup/importKeyRecoverInfo.ejs
+- PASSBOLT-2425: Chrome 61, issue with minified version of jquery
 
 ## [1.6.5] - 2017-09-14
 ### Fixed
@@ -184,7 +185,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - AP: User with plugin installed
 - LU: Logged in user
 
-[Unreleased]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.5...HEAD
+[Unreleased]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.6...HEAD
+[1.6.6]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.5...v1.6.6
 [1.6.5]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.4...v1.6.5
 [1.6.4]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.3...v1.6.4
 [1.6.3]: https://github.com/passbolt/passbolt_browser_extension/compare/v1.6.2...v1.6.3

Gruntfile.js

@@ -160,7 +160,7 @@ module.exports = function(grunt) {
 					{expand: true, cwd: path.node_modules + 'openpgp/dist', src: ['openpgp.js','openpgp.worker.js'], dest: path.src_addon_vendors},
 					{expand: true, cwd: path.node_modules + 'openpgp/dist', src: ['openpgp.js','openpgp.worker.js'], dest: path.build_vendors},
 					// jquery
-					{expand: true, cwd: path.node_modules + 'jquery/dist', src: 'jquery.min.js', dest: path.src_content_vendors},
+                    {expand: true, cwd: path.node_modules + 'jquery/dist', src: 'jquery.js', dest: path.src_content_vendors},
 					// jssha
 					{expand: true, cwd: path.node_modules + 'jssha/src', src: 'sha.js', dest: path.src_addon_vendors},
 					{expand: true, cwd: path.node_modules + 'jssha/src', src: 'sha.js', dest: path.src_content_vendors},

src/all/background_page/pagemod/bootstrapPagemod.js

@@ -27,7 +27,7 @@ Bootstrap.init = function () {
     contentScriptWhen: 'ready',
     contentStyleFile: [],
     contentScriptFile: [
-      'data/vendors/jquery.min.js',
+      'data/vendors/jquery.js',
       'data/tpl/login.js',
       'data/js/lib/port.js',
       'data/js/lib/request.js',

src/all/background_page/pagemod/debugPagemod.js

@@ -29,7 +29,7 @@ Debug.init = function () {
     include: new RegExp('.*'),
 
     contentScriptFile: [
-      'data/vendors/jquery.min.js',
+      'data/vendors/jquery.js',
       'data/js/lib/port.js',
       'data/js/lib/request.js',
       'data/js/lib/message.js',

src/all/background_page/pagemod/passboltAppPagemod.js

@@ -49,7 +49,7 @@ PassboltApp.initPageMod = function () {
       'data/css/external.min.css'
     ],
     contentScriptFile: [
-      'data/vendors/jquery.min.js',
+      'data/vendors/jquery.js',
 
       // Templates
       'data/tpl/group.js',

src/all/background_page/pagemod/passboltAuthPagemod.js

@@ -37,7 +37,7 @@ PassboltAuth.init = function () {
       'data/css/external.min.css'
     ],
     contentScriptFile: [
-      'data/vendors/jquery.min.js',
+      'data/vendors/jquery.js',
       'data/tpl/login.js',
       'data/js/lib/port.js',
       'data/js/lib/message.js',

src/all/background_page/pagemod/setupBootstrapPagemod.js

@@ -28,7 +28,7 @@ SetupBootstrap.init = function () {
     contentScriptWhen: 'ready',
     contentStyleFile: [],
     contentScriptFile: [
-      'data/vendors/jquery.min.js',
+      'data/vendors/jquery.js',
       'data/js/lib/port.js',
       'data/js/lib/message.js',
       'data/js/lib/request.js',
@@ -42,4 +42,4 @@ SetupBootstrap.init = function () {
   });
 };
 
-exports.SetupBootstrap = SetupBootstrap;
+exports.SetupBootstrap = SetupBootstrap;

src/all/data/js/include/config-debug.js

@@ -1,6 +1,6 @@
 var portname = 'config-debug';
 var scripts = [
-  'vendors/jquery.min.js',
+  'vendors/jquery.js',
   'vendors/sha.js',
   'vendors/xregexp-all.js',
   'js/lib/port.js'

src/all/data/js/include/setup.js

@@ -1,6 +1,6 @@
 var portname = 'setup';
 var scripts = [
-  'vendors/jquery.min.js',
+  'vendors/jquery.js',
   'vendors/sha.js',
   'vendors/xregexp-all.js',
   'vendors/farbtastic.js',

src/all/data/passbolt-iframe-clipboard.html

@@ -2,7 +2,7 @@
 <html lang="en" class="alpha version passboltplugin">
 <head>
     <meta charset="utf-8"/>
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
     <script src="js/lib/message.js"></script>
@@ -11,4 +11,4 @@
 <body>
     <textarea id="ClipboardText" style="width:1px;height:1px;"></textarea>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-file.html

@@ -2,12 +2,12 @@
 <html lang="en" class="alpha version passboltplugin">
 <head>
     <meta charset="utf-8"/>
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
     <script src="js/lib/message.js"></script>
     <script src="js/file/fileIframe.js"></script>
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-group-edit-autocomplete.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/group.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
@@ -13,4 +13,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-group-edit.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/group.js"></script>
     <script src="tpl/secret.js"></script>
     <script src="js/lib/port.js"></script>
@@ -15,4 +15,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-login-form.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/login.js"></script>
     <script src="tpl/secret.js"></script>
     <script src="js/lib/port.js"></script>
@@ -15,4 +15,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-master-password.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/master.js"></script>
     <script src="tpl/secret.js"></script>
     <script src="js/lib/port.js"></script>
@@ -15,4 +15,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-password-share-autocomplete.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/resource.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
@@ -13,4 +13,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-password-share.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/resource.js"></script>
     <script src="tpl/secret.js"></script>
     <script src="js/lib/port.js"></script>
@@ -15,4 +15,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-progress-dialog.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/progress.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
@@ -13,4 +13,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>

src/all/data/passbolt-iframe-secret-edition.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <link href="css/main_webext.min.css" media="all" rel="stylesheet">
-    <script src="vendors/jquery.min.js"></script>
+    <script src="vendors/jquery.js"></script>
     <script src="tpl/secret.js"></script>
     <script src="js/lib/port.js"></script>
     <script src="js/lib/request.js"></script>
@@ -15,4 +15,4 @@
 </head>
 <body>
 </body>
-</html>
+</html>