diff --git a/.DS_Store b/.DS_Store index 1c7c74c..a22a959 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/app/.DS_Store b/app/.DS_Store index db389a3..9f01e4e 100644 Binary files a/app/.DS_Store and b/app/.DS_Store differ diff --git a/app/.lock-waf_darwin_build b/app/.lock-waf_darwin_build index 7aa6794..169f48a 100644 --- a/app/.lock-waf_darwin_build +++ b/app/.lock-waf_darwin_build @@ -1,5 +1,5 @@ argv = ['/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', 'configure', 'build'] -environ = {'TERM_SESSION_ID': '0E771BB8-6D47-41B3-A896-1B67A6BC492D', 'SSH_AUTH_SOCK': '/tmp/launch-mBweRR/Listeners', 'PYTHONPATH': '/Users/dan/pebble-dev/PebbleSDK-current/bin/../.env/lib/python2.7/site-packages', 'VERSIONER_PYTHON_PREFER_32_BIT': 'no', 'TERM_PROGRAM_VERSION': '326', 'SHELL': '/bin/bash', 'LOGNAME': 'dan', 'USER': 'dan', 'HOME': '/Users/dan', 'PATH': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/arm-cs-tools/bin:/Users/dan/pebble-dev/PebbleSDK-current/bin:/Applications/Android Studio.app/sdk/tools/:/Applications/Android Studio.app/sdk/platform-tools/:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin', 'DISPLAY': '/tmp/launch-FHtlTI/org.macosforge.xquartz:0', 'TMPDIR': '/var/folders/5l/h8wjt5t52cs2n6h7zcd3kw040000gn/T/', 'TERM_PROGRAM': 'Apple_Terminal', 'LANG': 'en_GB.UTF-8', 'TERM': 'xterm-256color', 'Apple_PubSub_Socket_Render': '/tmp/launch-BrNYWU/Render', 'VERSIONER_PYTHON_VERSION': '2.7', 'SHLVL': '2', '__CF_USER_TEXT_ENCODING': '0x1F5:0:0', 'PWD': '/Users/dan/Workspace/minewatch/app', '_': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', '__CHECKFIX1436934': '1'} +environ = {'TERM_SESSION_ID': '0E771BB8-6D47-41B3-A896-1B67A6BC492D', 'SSH_AUTH_SOCK': '/tmp/launch-mBweRR/Listeners', 'PYTHONPATH': '/Users/dan/pebble-dev/PebbleSDK-current/bin/../.env/lib/python2.7/site-packages', 'VERSIONER_PYTHON_PREFER_32_BIT': 'no', 'TERM_PROGRAM_VERSION': '326', 'SHELL': '/bin/bash', 'LOGNAME': 'dan', 'USER': 'dan', 'HOME': '/Users/dan', 'PATH': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/arm-cs-tools/bin:/Users/dan/pebble-dev/PebbleSDK-current/bin:/Applications/Android Studio.app/sdk/tools/:/Applications/Android Studio.app/sdk/platform-tools/:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin', 'DISPLAY': '/tmp/launch-FHtlTI/org.macosforge.xquartz:0', 'TMPDIR': '/var/folders/5l/h8wjt5t52cs2n6h7zcd3kw040000gn/T/', 'TERM_PROGRAM': 'Apple_Terminal', 'LANG': 'en_GB.UTF-8', 'TERM': 'xterm-256color', 'Apple_PubSub_Socket_Render': '/tmp/launch-BrNYWU/Render', 'VERSIONER_PYTHON_VERSION': '2.7', 'SHLVL': '2', '__CF_USER_TEXT_ENCODING': '0x1F5:0:0', 'PWD': '/Users/dan/Workspace/minewatch/app', '_': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', '__CHECKFIX1436934': '1', 'PEBBLE_PHONE': '192.168.1.147'} files = ['/Users/dan/Workspace/minewatch/app/wscript'] hash = 4672844372416070989 options = {'files': '', 'jobs': 4, 'verbose': 0, 'nocache': False, 'progress_bar': 0, 'timestamp': None, 'distcheck_args': None, 'top': '', 'destdir': '', 'keep': 0, 'zones': '', 'debug': False, 'prefix': '/usr/local/', 'download': False, 'force': False, 'targets': '', 'out': ''} diff --git a/app/appinfo.json b/app/appinfo.json index 2c813c5..ee52f64 100644 --- a/app/appinfo.json +++ b/app/appinfo.json @@ -3,8 +3,8 @@ "shortName": "MineWatch", "longName": "MineWatch", "companyName": "Daniel Head", - "versionCode": 1, - "versionLabel": "1.0.0", + "versionCode": 2, + "versionLabel": "1.0.1", "watchapp": { "watchface": true }, diff --git a/app/resources/promo.png b/app/resources/promo.png index faaa0fc..30a13b5 100644 Binary files a/app/resources/promo.png and b/app/resources/promo.png differ diff --git a/app/resources/promo.xcf b/app/resources/promo.xcf index 28817e5..59147a6 100644 Binary files a/app/resources/promo.xcf and b/app/resources/promo.xcf differ diff --git a/app/resources/red_pebble.xcf b/app/resources/red_pebble.xcf index 97dc07a..fb4d9a6 100644 Binary files a/app/resources/red_pebble.xcf and b/app/resources/red_pebble.xcf differ diff --git a/httpdocs/.idea/deployment.xml b/httpdocs/.idea/deployment.xml index 75924ba..d56dd53 100644 --- a/httpdocs/.idea/deployment.xml +++ b/httpdocs/.idea/deployment.xml @@ -1,5 +1,15 @@ - + + + + + + + + + + + diff --git a/httpdocs/.idea/watcherTasks.xml b/httpdocs/.idea/watcherTasks.xml index 0a58648..0b4696a 100644 --- a/httpdocs/.idea/watcherTasks.xml +++ b/httpdocs/.idea/watcherTasks.xml @@ -15,7 +15,7 @@ - @@ -157,7 +144,6 @@ - @@ -204,6 +190,20 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + @@ -269,30 +303,31 @@ 1395600189451 + - + + - + - - - - + - + + + + - @@ -321,14 +356,6 @@ - - - - - - - - @@ -341,12 +368,7 @@ - - - - - - + @@ -402,12 +424,7 @@ - - - - - - + @@ -446,12 +463,7 @@ - - - - - - + @@ -490,12 +502,7 @@ - - - - - - + @@ -542,12 +549,7 @@ - - - - - - + @@ -594,12 +596,7 @@ - - - - - - + @@ -682,37 +679,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -724,12 +690,36 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -741,18 +731,26 @@ - + - - + + - + - - + + + + + + + + + + diff --git a/httpdocs/config.src/body.html b/httpdocs/config.src/body.html index 4a3080b..42b8b72 100644 --- a/httpdocs/config.src/body.html +++ b/httpdocs/config.src/body.html @@ -23,7 +23,7 @@

Updates

  • -

    v1.0.0 (11th April 2014)

    +

    v1.0.1 (8th May 2014)

    • Initial release
    • Support for Slush's pool
      • diff --git a/httpdocs/css/main.css b/httpdocs/css/main.css index e6b7036..78ecab7 100644 --- a/httpdocs/css/main.css +++ b/httpdocs/css/main.css @@ -11,6 +11,11 @@ h1, h2, h3, .footer { .heading ul { list-style-type: circle; } +.panel.news h4, .panel.news p.date { + display: inline-block; } +.panel.news p.date { + font-size: 0.8em; } + @media only screen and (max-width: 48em) { .heading { margin-top: 5px; } diff --git a/httpdocs/css/main.scss b/httpdocs/css/main.scss index 8e0ee9e..b916ea4 100644 --- a/httpdocs/css/main.scss +++ b/httpdocs/css/main.scss @@ -8,14 +8,23 @@ h1, h2, h3, .footer { .heading { margin: 20px auto; h1 { - font-size:250%; + font-size: 250%; } h2 { - font-size:120%; + font-size: 120%; } ul { list-style-type: circle; } + +} +.panel.news { + h4, p.date { + display: inline-block; + } + p.date { + font-size:0.8em; + } } @media only screen and (max-width: 48em) { .heading { diff --git a/httpdocs/img/pebble_black.png b/httpdocs/img/pebble_black.png new file mode 100644 index 0000000..1f0ae03 Binary files /dev/null and b/httpdocs/img/pebble_black.png differ diff --git a/httpdocs/img/pebble_white.png b/httpdocs/img/pebble_white.png new file mode 100644 index 0000000..bfff2dd Binary files /dev/null and b/httpdocs/img/pebble_white.png differ diff --git a/httpdocs/index.php b/httpdocs/index.php index 458090d..1222e57 100644 --- a/httpdocs/index.php +++ b/httpdocs/index.php @@ -24,13 +24,13 @@ define("accessAllowed", true); fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk'));
      -
      Pebble
      +
      Pebble

      MineWatch

      Your Bitcoin workers, now on your wrist

      -
      Pebble
      +
      Pebble

      Features

        @@ -46,13 +46,15 @@ define("accessAllowed", true);
        -
        -

        Coming soon

        +
        +

        NEWS

        +
        +

        MineWatch released

        +

        by Dan – 8th May at 21:42

        -

        To the Pebble App Store.

        +

        MineWatch has been published to the Pebble Appstore today. It is available immediately on Android and is currently pending approval on iOS, this process should take no more than 2 weeks.

        -

        At launch the watch face will only support Slush's Pool API, I am happy to add support for other mining pools - upon request. Please Contact me to request support.

        +

        The watchface currently only supports Slush's Pool, please fill out the form below if you with to request support for other Pools.