diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index 80cb63b13..fc689fd60 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -3,9 +3,9 @@ "//":" Modify it at app-template/", "manifest_version": 2, - "name": "Copay", - "description": "A Secure Bitcoin Wallet", - "version": "2.5.0", + "name": "BitPay", + "description": "The BitPay Bitcoin Wallet", + "version": "0.3.0", "permissions": [ "storage", "unlimitedStorage", diff --git a/package.json b/package.json index df700bb1d..3f287c72c 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "//":"PLEASE! Do not edit this file directly", "//":" Modify it at app-template/", - "name": "copay", - "description": "A Secure Bitcoin Wallet", + "name": "bitpay", + "description": "The BitPay Bitcoin Wallet", "author": "BitPay", - "version": "2.5.0", + "version": "0.3.0", "keywords": [ "wallet", "copay", diff --git a/public/views/starting.html b/public/views/starting.html new file mode 100644 index 000000000..e73578b58 --- /dev/null +++ b/public/views/starting.html @@ -0,0 +1,3 @@ +

Starting...

+ +Splash screen me... diff --git a/src/js/routes.js b/src/js/routes.js index d84f8b502..2daf19559 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -14,7 +14,7 @@ if (window && window.navigator) { //Setting up route angular.module('copayApp').config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider, $compileProvider, $ionicConfigProvider) { - $urlRouterProvider.otherwise('/tabs/home'); + $urlRouterProvider.otherwise('/starting'); // NO CACHE $ionicConfigProvider.views.maxCache(0); @@ -95,6 +95,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/unsupported.html' }) + .state('starting', { + url: '/starting', + templateUrl: 'views/starting.html' + }) + + /* * @@ -757,7 +763,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } else { profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); - // $state.transitionTo('tabs.home'); + $state.transitionTo('tabs.home'); } }); diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index f8b40fe84..67bbc6f08 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application -Version=2.5.0 -Name=Copay -Comment=A Secure Bitcoin Wallet -Exec=copay +Version=0.3.0 +Name=BitPay +Comment=The BitPay Bitcoin Wallet +Exec=bitpay Icon=icon-256.png Terminal=false Categories=Finance diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss index f0925a3b4..7973ff779 100755 --- a/webkitbuilds/setup-win.iss +++ b/webkitbuilds/setup-win.iss @@ -1,10 +1,10 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "copay" -#define MyAppVersion "2.5.0" +#define MyAppName "bitpay" +#define MyAppVersion "0.3.0" #define MyAppPublisher "BitPay" -#define MyAppURL "https://copay.io" +#define MyAppURL "https://bitpay.com" #define MyAppExeName "*NAMECASENOSPACE.exe" [Setup] @@ -18,7 +18,7 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} -OutputBaseFilename=Copay-win +OutputBaseFilename=BitPay-win OutputDir=./ Compression=lzma SolidCompression=yes @@ -32,8 +32,8 @@ Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "Copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "Copay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "BitPay\win64\bitpay.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "BitPay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -50,8 +50,8 @@ Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; V Root: HKCR; Subkey: "bitcoin\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" Root: HKCR; Subkey: "bitcoin\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" -Root: HKCR; Subkey: "copay"; ValueType: "string"; ValueData: "URL:Copay Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "copay"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "copay\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "copay\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" +Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueData: "URL:BitPay Custom Protocol"; Flags: uninsdeletekey +Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" +Root: HKCR; Subkey: "bitpay\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" +Root: HKCR; Subkey: "bitpay\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1"""