Skip to content

Commit

Permalink
Merge pull request #20 from MOLPay/demo_kc
Browse files Browse the repository at this point in the history 
Release 3.11.0
  • Loading branch information
@Kheechieng
Kheechieng authored Apr 4, 2017
2 parents 3a728df + a4632a1 commit ee12587
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.d549f114.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.js"></script> </body> </html>
1 change: 1 addition & 0 deletions MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.03193944.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.d549f114.js
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...y-mobile-xdk-www/styles/main.d7e0b867.css → ...y-mobile-xdk-www/styles/main.88dcea2c.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions MOLPayXDKExample/MOLPayXDKExample/MOLPayXDKExample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<MtouchFastDev>true</MtouchFastDev>
<MtouchUseSGen>true</MtouchUseSGen>
<MtouchUseRefCounting>true</MtouchUseRefCounting>
<MtouchLink>None</MtouchLink>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>i386</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<MtouchTlsProvider>Default</MtouchTlsProvider>
Expand Down Expand Up @@ -79,7 +79,7 @@
<MtouchUseRefCounting>true</MtouchUseRefCounting>
<MtouchFloat32>true</MtouchFloat32>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchLink>None</MtouchLink>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<MtouchTlsProvider>Default</MtouchTlsProvider>
Expand Down Expand Up @@ -110,7 +110,6 @@
<None Include="Info.plist" />
<None Include="Entitlements.plist" />
<None Include="packages.config" />
<None Include="Content\molpay-mobile-xdk-www\.DS_Store" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand All @@ -131,11 +130,12 @@
<BundleResource Include="Content\molpay-mobile-xdk-www\fonts\fontawesome-webfont.ttf" />
<BundleResource Include="Content\molpay-mobile-xdk-www\fonts\fontawesome-webfont.woff" />
<BundleResource Include="Content\molpay-mobile-xdk-www\fonts\fontawesome-webfont.woff2" />
<BundleResource Include="Content\molpay-mobile-xdk-www\scripts\scripts.d549f114.js" />
<BundleResource Include="Content\molpay-mobile-xdk-www\scripts\scripts.03193944.js" />
<BundleResource Include="Content\molpay-mobile-xdk-www\scripts\vendor.f57621ed.js" />
<BundleResource Include="Content\molpay-mobile-xdk-www\styles\main.d7e0b867.css" />
<BundleResource Include="Content\molpay-mobile-xdk-www\styles\main.88dcea2c.css" />
<BundleResource Include="Content\molpay-mobile-xdk-www\styles\vendor.34eb91d2.css" />
<BundleResource Include="Content\molpay-mobile-xdk-www\index.html" />
<BundleResource Include="Content\molpay-mobile-xdk-www\.DS_Store" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.d549f114.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.88dcea2c.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.js"></script> </body> </html>
1 change: 1 addition & 0 deletions molpay-mobile-xdk-www/scripts/scripts.03193944.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion molpay-mobile-xdk-www/scripts/scripts.d549f114.js
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...y-mobile-xdk-www/styles/main.d7e0b867.css → ...y-mobile-xdk-www/styles/main.88dcea2c.css
View file

Large diffs are not rendered by default.

0 comments on commit ee12587

Please sign in to comment.