Merge pull request #242 from FlowzPlatform/QA

Qa
FlowzPlatform · May 15, 2018 · 52b41d5 · 52b41d5
2 parents efcaae2 + 606d9a9
commit 52b41d5
Show file tree

Hide file tree

Showing 73 changed files with 17,813 additions and 6,810 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -89,4 +89,4 @@ notifications:
       - [email protected]
       - [email protected]
     on_success: always
-    on_failure: always
+    on_failure: always
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+# uploader
+uploader
diff --git a/client/.gitignore b/client/.gitignore
@@ -14,4 +14,3 @@ selenium-debug.log
 *.ntvs*
 *.njsproj
 *.sln
-package-lock.json
diff --git a/client/index.html b/client/index.html
@@ -3,12 +3,12 @@
 
 <head>
   <meta charset="utf-8">
-  <title>flowz-uploader</title>
+  <title>Flowz Uploader</title>
   <!-- <script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js"></script> -->
   <!-- <meta charset="utf-8"> -->
   <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
-  <link rel="shortcut icon" href="./static/img/favicon.ico" type="image/ico" sizes="16x16">
-  <title>Flowz Builder | The next generation Dynamic website builder.</title>
+  <link rel="shortcut icon" href="https://res.cloudinary.com/flowz/raw/upload/v1521729139/flowz-dashboard/favicon.ico" type="image/ico" sizes="16x16">
+  <!-- <title>Flowz Builder | The next generation Dynamic website builder.</title> -->
 
   <!-- <link href="/static/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"> -->
 
@@ -20,6 +20,9 @@
   <!-- jQuery -->
   <script src="/static/js/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
   <script src="/static/js/jquery-ui.min.js" crossorigin="anonymous"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js" type="text/javascript"></script>
+
 
   <!-- Grapes JS COmponent -->
   <!-- <link rel="stylesheet" type="text/css" href="/static/css/grapes.min.css">
@@ -46,6 +49,7 @@
   <script src="https://docs.handsontable.com/pro/1.0.0/bower_components/handsontable-pro/dist/handsontable.full.min.js"></script>
   <link type="text/css" rel="stylesheet" href="https://docs.handsontable.com/pro/1.0.0/bower_components/handsontable-pro/dist/handsontable.full.min.css">
   <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.24.min.js"></script>
+  <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css" rel="stylesheet"/>
 
 
   <!-- for amazon s3 -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,3 @@ selenium-debug.log @@
     *.ntvs*
     *.njsproj
     *.sln
-    package-lock.json