diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-12-10 00:28:40 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-12-10 00:28:40 -0600 |
| commit | b10c59b70991ad32fc1c978310fd3d5e32a7e5ff (patch) | |
| tree | ec5e42a7ae78c079811d1602dcdfe072209921b1 | |
| parent | 6748251431886b5311db3de2cd6fd22447f59f33 (diff) | |
android debug
38 files changed, 13 insertions, 9 deletions
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock Binary files differindex 301f893c..6f93dc99 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex 67e72dc0..d07355ac 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex 741fe391..c0eccf6f 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex b9462a8a..6893fc73 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex 50dfb926..adc17cdd 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar Binary files differindex c73cd082..ca36fcb7 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar Binary files differindex 8bc3a37b..35c41ca7 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml index 4ee4d780..c2035cd4 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml index 636cffac..a4369060 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml index c5f89e2a..45310184 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml index 3412ebcd..4b722ce0 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\release"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx\StoneIsland\platforms\android\CordovaLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\release"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar Binary files differindex 2e470f93..66e76651 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar Binary files differindex 0cb8cccb..9a41f6e6 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index b5f6c1b9..4c32c10b 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -11,7 +11,9 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> - <meta http-equiv="Content-Security-Policy" content="default-src 'self' lvh.me lvh.me:5000 cdn.yoox.biz secure.api.yoox.biz cdn3.yoox.biz ltho.s3.amazonaws.com stone.sup.land secure.api.yoox.com data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> +<!-- + <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> +--> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> @@ -200,7 +202,6 @@ </script> </div> - <div class="extra" style="height:500px">asdf</div> </div> <div class="menu"> <div class="items"> diff --git a/StoneIsland/platforms/android/res/drawable-hdpi/appicon.png b/StoneIsland/platforms/android/res/drawable-hdpi/appicon.png Binary files differdeleted file mode 100755 index aac1482a..00000000 --- a/StoneIsland/platforms/android/res/drawable-hdpi/appicon.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-hdpi/background.9.png b/StoneIsland/platforms/android/res/drawable-hdpi/background.9.png Binary files differdeleted file mode 100755 index be2a9cca..00000000 --- a/StoneIsland/platforms/android/res/drawable-hdpi/background.9.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-hdpi/icon.png b/StoneIsland/platforms/android/res/drawable-hdpi/icon.png Binary files differnew file mode 100755 index 00000000..8df5f45f --- /dev/null +++ b/StoneIsland/platforms/android/res/drawable-hdpi/icon.png diff --git a/StoneIsland/platforms/android/res/drawable-land-hdpi/screen.png b/StoneIsland/platforms/android/res/drawable-land-hdpi/screen.png Binary files differindex a61e2b1a..8a0749ff 100755 --- a/StoneIsland/platforms/android/res/drawable-land-hdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-land-hdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-land-ldpi/screen.png b/StoneIsland/platforms/android/res/drawable-land-ldpi/screen.png Binary files differindex f3934cdc..93cd23a6 100755 --- a/StoneIsland/platforms/android/res/drawable-land-ldpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-land-ldpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-land-mdpi/screen.png b/StoneIsland/platforms/android/res/drawable-land-mdpi/screen.png Binary files differindex a1b697c5..51a85824 100755 --- a/StoneIsland/platforms/android/res/drawable-land-mdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-land-mdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-land-xhdpi/screen.png b/StoneIsland/platforms/android/res/drawable-land-xhdpi/screen.png Binary files differindex 79f2f094..06826932 100755 --- a/StoneIsland/platforms/android/res/drawable-land-xhdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-land-xhdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-ldpi/icon.png b/StoneIsland/platforms/android/res/drawable-ldpi/icon.png Binary files differindex cd5032a4..a474f595 100755 --- a/StoneIsland/platforms/android/res/drawable-ldpi/icon.png +++ b/StoneIsland/platforms/android/res/drawable-ldpi/icon.png diff --git a/StoneIsland/platforms/android/res/drawable-mdpi/appicon.png b/StoneIsland/platforms/android/res/drawable-mdpi/appicon.png Binary files differdeleted file mode 100755 index 0718cd93..00000000 --- a/StoneIsland/platforms/android/res/drawable-mdpi/appicon.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-mdpi/background.9.png b/StoneIsland/platforms/android/res/drawable-mdpi/background.9.png Binary files differdeleted file mode 100755 index 6b08408b..00000000 --- a/StoneIsland/platforms/android/res/drawable-mdpi/background.9.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-mdpi/icon.png b/StoneIsland/platforms/android/res/drawable-mdpi/icon.png Binary files differnew file mode 100755 index 00000000..42172a1d --- /dev/null +++ b/StoneIsland/platforms/android/res/drawable-mdpi/icon.png diff --git a/StoneIsland/platforms/android/res/drawable-port-hdpi/screen.png b/StoneIsland/platforms/android/res/drawable-port-hdpi/screen.png Binary files differindex 5d6a28a8..5a36e7a3 100755 --- a/StoneIsland/platforms/android/res/drawable-port-hdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-port-hdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-port-ldpi/screen.png b/StoneIsland/platforms/android/res/drawable-port-ldpi/screen.png Binary files differindex 65ad163a..7435c1dc 100755 --- a/StoneIsland/platforms/android/res/drawable-port-ldpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-port-ldpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-port-mdpi/screen.png b/StoneIsland/platforms/android/res/drawable-port-mdpi/screen.png Binary files differindex ea156935..18114cc4 100755 --- a/StoneIsland/platforms/android/res/drawable-port-mdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-port-mdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-port-xhdpi/screen.png b/StoneIsland/platforms/android/res/drawable-port-xhdpi/screen.png Binary files differindex c2e80421..37a6589d 100755 --- a/StoneIsland/platforms/android/res/drawable-port-xhdpi/screen.png +++ b/StoneIsland/platforms/android/res/drawable-port-xhdpi/screen.png diff --git a/StoneIsland/platforms/android/res/drawable-xhdpi/appicon.png b/StoneIsland/platforms/android/res/drawable-xhdpi/appicon.png Binary files differdeleted file mode 100755 index 62f936e7..00000000 --- a/StoneIsland/platforms/android/res/drawable-xhdpi/appicon.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-xhdpi/background.9.png b/StoneIsland/platforms/android/res/drawable-xhdpi/background.9.png Binary files differdeleted file mode 100755 index df615025..00000000 --- a/StoneIsland/platforms/android/res/drawable-xhdpi/background.9.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-xhdpi/icon.png b/StoneIsland/platforms/android/res/drawable-xhdpi/icon.png Binary files differnew file mode 100755 index 00000000..e7af4387 --- /dev/null +++ b/StoneIsland/platforms/android/res/drawable-xhdpi/icon.png diff --git a/StoneIsland/platforms/android/res/drawable-xxhdpi/appicon.png b/StoneIsland/platforms/android/res/drawable-xxhdpi/appicon.png Binary files differdeleted file mode 100755 index cc472a60..00000000 --- a/StoneIsland/platforms/android/res/drawable-xxhdpi/appicon.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-xxhdpi/background.9.png b/StoneIsland/platforms/android/res/drawable-xxhdpi/background.9.png Binary files differdeleted file mode 100755 index 0fb565e9..00000000 --- a/StoneIsland/platforms/android/res/drawable-xxhdpi/background.9.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-xxxhdpi/appicon.png b/StoneIsland/platforms/android/res/drawable-xxxhdpi/appicon.png Binary files differdeleted file mode 100755 index 8dbcb244..00000000 --- a/StoneIsland/platforms/android/res/drawable-xxxhdpi/appicon.png +++ /dev/null diff --git a/StoneIsland/platforms/android/res/drawable-xxxhdpi/background.9.png b/StoneIsland/platforms/android/res/drawable-xxxhdpi/background.9.png Binary files differdeleted file mode 100755 index 9e75da26..00000000 --- a/StoneIsland/platforms/android/res/drawable-xxxhdpi/background.9.png +++ /dev/null diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index b5f6c1b9..4c32c10b 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -11,7 +11,9 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> - <meta http-equiv="Content-Security-Policy" content="default-src 'self' lvh.me lvh.me:5000 cdn.yoox.biz secure.api.yoox.biz cdn3.yoox.biz ltho.s3.amazonaws.com stone.sup.land secure.api.yoox.com data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> +<!-- + <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> +--> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> @@ -200,7 +202,6 @@ </script> </div> - <div class="extra" style="height:500px">asdf</div> </div> <div class="menu"> <div class="items"> diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 54a857b7..4c32c10b 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -11,7 +11,9 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> - <meta http-equiv="Content-Security-Policy" content="default-src 'self' lvh.me lvh.me:5000 cdn.yoox.biz secure.api.yoox.biz cdn3.yoox.biz ltho.s3.amazonaws.com stone.sup.land secure.api.yoox.com data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> +<!-- + <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> +--> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> |
