Commit Graph

476 Commits

Author SHA1 Message Date
Tam Tran 64ab3563f6 Addedwallet info 2018-03-03 14:56:43 -06:00
Tam Tran 25032f13b3 Added pool disclaimer 2018-03-03 14:53:45 -06:00
DREKLI 51534e9df1 Links fix 2018-03-03 21:53:07 +01:00
DREKLI 896664b9c1 Nav links
- Header
- Footer
2018-03-03 21:26:43 +01:00
Tam Tran efb8536eef Updated 2018-03-03 14:21:43 -06:00
Tam Tran 27afdcb2de Build 2018-03-03 14:20:38 -06:00
DREKLI ba2d1f4a1f Update to parent branch 2018-03-03 20:59:51 +01:00
DREKLI 8eff7aa79d Section : Wallets 2018-03-03 20:56:40 +01:00
Tam Tran 6d24e9a449 Build 2018-03-03 13:30:55 -06:00
Tam Tran 6349708498 updated button and pool 2018-03-03 13:29:37 -06:00
Tam Tran b821c5d0ba Build 2018-03-03 12:57:25 -06:00
DREKLI 35d9799e8a Fixes
- Nav item for press
- viewport
2018-03-03 19:48:36 +01:00
Tam Tran 7dfb2a78f0 Build 2018-03-03 12:33:47 -06:00
Tam Tran 6aacdb94b6 Merge branch 'develop' 2018-03-03 12:30:59 -06:00
root e0ed0e22d7 Improved pools layout 2018-03-03 14:58:28 +00:00
Tam Tran 133f7b2e25 Build 2018-03-03 07:30:06 -06:00
Tam Tran e03d331de4 Removed GA from yesterday 2018-03-03 07:29:17 -06:00
Tam Tran 8226dc88b2 updated build 2018-03-03 07:27:09 -06:00
Tam Tran edd5135ac8 Merged master into dev 2018-03-03 07:24:58 -06:00
Tam Tran 3ebc8edb56 Merge branch 'master' into develop 2018-03-03 07:22:40 -06:00
Lucky-Mining cd6d0c7bc9
Add Lucky-Mining pool for BTCP
Site: https://lucky-mining.com.ua/
BTCP Pool: https://btcp.lucky-mining.com.ua
Twitter: https://twitter.com/Lucky_Mining
Discord: https://discord.gg/ahnSBWK
Telegram: https://t.me/joinchat/C-peyBBrOQNLMAVqVhdX_Q
@ttran4040 Move merge request into develop branch.
2018-03-03 13:03:34 +02:00
CryptoJake22 e9d77ae214
Update pools.html 2018-03-03 01:15:41 -05:00
CryptoJake22 80472e5507
Update pools.html 2018-03-03 01:14:41 -05:00
CryptoJake22 fdffc88da5
Update pools.html 2018-03-03 01:13:49 -05:00
CryptoJake22 72a780b087
Update pools.html 2018-03-03 01:13:00 -05:00
CryptoJake22 2940bbf9a6
Update pools.html 2018-03-03 01:12:18 -05:00
CryptoJake22 9a93823c42
Update pools.html 2018-03-03 01:11:36 -05:00
CryptoJake22 296c037812
Update pools.html 2018-03-03 01:09:49 -05:00
Tam Tran 1a46639a32 Build 2018-03-02 19:40:57 -06:00
Tam Tran 13339c2589 updated pools 2018-03-02 19:40:05 -06:00
Tam Tran 186ae80436 Merge branch 'master' of https://github.com/BTCP-community/bitcoinprivate-prefork-website 2018-03-02 18:00:42 -06:00
root 23c7c519df Add Pools link to footer 2018-03-02 18:55:32 +00:00
root 78fd90793f _blank targets added to pool links (/docs) 2018-03-02 18:36:29 +00:00
root e612849f6a Add pool links 2018-03-02 18:33:10 +00:00
root be8b76aaef Pools page added 2018-03-02 18:28:02 +00:00
root 6a0d60e4ec Add Pools link and extra GA tracking 2018-03-02 18:10:23 +00:00
Tam Tran 1c527e6437
Merge branch 'develop' into Page-Press 2018-03-02 10:40:07 -06:00
DREKLI 362f26a6f2 Resolve 2018-03-02 17:06:25 +01:00
DREKLI da5874de5f Copy/text dupe fix 2018-03-02 16:59:51 +01:00
DREKLI 687d537f08 Constant menu items in Legals 2018-03-02 16:58:18 +01:00
DREKLI 7418735e54 Page : Press Initial
Clone of Resources section, with amendment to initial copy (new loc-keys)

- Market Cap moved below for press copy to stand out
- Alignments altered for Socials to stay sat on the right 1/4 screen if > '.col-x' etc
- Added Press to Header & Footer nav
- Broke out '#resources' css to make future imporvements easier/faster
2018-03-02 16:22:12 +01:00
Fj00 a8c4051073 html files 2018-03-01 22:47:14 -05:00
Fj00 f5c5b88ee2 merge conflict 2018-03-01 22:42:22 -05:00
Tam Tran 82f8febf63 Merge branch 'develop' 2018-03-01 15:48:00 -06:00
Tam Tran 9031ddcfac
Merge pull request #54 from rizkiwicaksono/fix-twitter-handle
Fix twitter handle
2018-03-01 15:47:37 -06:00
Tam Tran 7f8b033812 Merge dev 2018-03-01 15:36:17 -06:00
DREKLI 909c13fbf9 Snapshot correction
Typo on classname
2018-03-01 22:24:19 +01:00
DREKLI 4d03dfaf30 Re-add Reddit
That's what was missing with the broken html.
2018-03-01 20:41:50 +01:00
DREKLI 2f6a931047 Press Page 2018-03-01 20:39:22 +01:00
Rizki Wicaksono 11cb0527ef fixed twitter handle 2018-03-01 11:20:33 -08:00
DREKLI b1c4c52166 Snapshot : Improvements
- removed some broken html/characters from official statement message
- Add 'blocks' to above block height so that its clearer
2018-03-01 19:45:34 +01:00
BlueSilver22 63b6a73d20
Add files via upload 2018-03-01 12:00:12 -06:00
root a091d77fc5 Press info updates 2018-03-01 15:46:26 +00:00
BlueSilver22 cb501fd216
Add files via upload 2018-03-01 06:31:46 -06:00
Tam Tran 22d5d1e683 build 2018-02-28 11:57:32 -06:00
Tam Tran 30ae79e7d6 Build 2018-02-28 11:57:11 -06:00
DREKLI 892038eced Snapshot : Mainnet 2018-02-28 18:55:10 +01:00
Tam Tran 68eeab7383 merged develop 2018-02-28 11:44:45 -06:00
Tam Tran 3e78d083c6 Added blocks 2018-02-28 11:42:17 -06:00
Tam Tran 43ab0dd39b
Merge branch 'develop' into Snapshot 2018-02-28 11:40:30 -06:00
Tam Tran 0a544fb283 mergd develop 2018-02-28 11:26:53 -06:00
Tam Tran de2ccf9f06 Merge branch 'develop' 2018-02-28 11:26:16 -06:00
DREKLI 8202fbf6e4 Snapshot update 2018-02-28 18:25:32 +01:00
root 3f6110478b Block heights set 2018-02-28 17:23:39 +00:00
DREKLI 7073aa8735 Snapshot. Show Awaiting 2018-02-28 18:23:06 +01:00
Tam Tran 2f1b79020a Mergdd countdown note develop 2018-02-28 10:23:24 -06:00
Tam Tran 3e59dfbd64 Build coutndown note 2018-02-28 10:22:26 -06:00
DREKLI 251590dee0 Countdown : Note 2018-02-28 17:16:03 +01:00
Tam Tran 845574c4b6 merged develop 2018-02-28 09:29:42 -06:00
Tam Tran f4a6c64f07 Build 2018-02-28 09:28:50 -06:00
Tam Tran 03d7be7e6e
Merge branch 'develop' into Team 2018-02-28 09:26:21 -06:00
DREKLI 73d626ba17 Add space after comma #38 2018-02-28 16:10:18 +01:00
DREKLI 9bdf55a909 White navbar-collapse on .md
Shucked the white background down to .sm where it should be.
2018-02-28 14:14:56 +01:00
DREKLI 013789fa39 Team
- Member Added : Jonathan Twomley

Big cleanup to make the page look better responsively.

- Classes add, attachment to #id removed
-HEX colors replaced for correct variables
- Names now aren't pushed down below image so that it looks like previous name is for next team member image.
- No push down/bad alignment of team members if previous had no link
- Community classes now separate from Team
2018-02-28 13:55:36 +01:00
Tam Tran a1e769f15d Updated language for hitbtc 2018-02-27 13:12:04 -06:00
DREKLI 8fc754ded0 Correction 2018-02-27 20:08:40 +01:00
DREKLI 8fd2ee787d Correction HitBTC | Add KuCoin 2018-02-27 18:59:42 +01:00
Fj00 f0254a59a0 merge conflict 2018-02-27 10:36:03 -05:00
Tam Tran 0aa4ba6732 Added hitbtc 2018-02-27 08:24:41 -06:00
DREKLI 3a69a611e6 Add HitBTC 2018-02-27 13:27:28 +01:00
Fj00 0595c3a1ec html files 2018-02-25 23:50:57 -05:00
Daniel Farina 0d0737c76d
Merge branch 'master' into faq-update 2018-02-25 23:03:05 -05:00
Fj00 4359fe2e02 blog posts sample data 2018-02-25 22:53:09 -05:00
Fj00 72f39ff42f html files 2018-02-25 22:52:41 -05:00
Fj00 0d6128a2a2 change divider margins 2018-02-25 22:52:13 -05:00
Fj00 603e1e999b html files 2018-02-25 22:46:45 -05:00
Fj00 f326f76aff blog css 2018-02-25 22:46:22 -05:00
Fj00 bfe5df4cc7 blog css 2018-02-25 22:45:52 -05:00
DREKLI 44c91edb36 Faq update
- Minor fix to #30 = TradeSatoshi.com link was posted outside the <P>
- TradeSatoshi added to "Where can I store my ZCL to ensure I get my BTCP?"
- TradeSatoshi added to "What exchanges will support the fork?"
2018-02-25 23:34:11 +01:00
Fj00 8a4aa3b4de html file 2018-02-25 17:01:33 -05:00
Fj00 86cc9faf16 finish creating blog data 2018-02-25 16:59:31 -05:00
J62 010ff2a7ee
Merge branch 'develop' into interbiznw-patch-2 2018-02-25 13:55:55 -08:00
Fj00 6cbd04422d blog in footer 2018-02-25 14:31:03 -05:00
Fj00 fa6876b9c9 blog.js 2018-02-25 14:30:46 -05:00
Fj00 f62da7fcde blog.html 2018-02-25 14:30:34 -05:00
Fj00 31de2b62a7 add blog css 2018-02-25 14:30:17 -05:00
Fj00 67ed6294a6 add moment.js 2018-02-25 14:29:25 -05:00
Tam Tran 6408974111 updated privacy 2018-02-25 08:57:03 -06:00
DREKLI 306a71d126 Add Privacy Page #34 2018-02-25 15:29:33 +01:00
Tam Tran 5905a55b8c fixed countdown 2018-02-25 08:07:48 -06:00
root 1a0186372e IE/Edge hack to fix x & y axis of counter progress 2018-02-25 14:00:50 +00:00
BlueSilver22 28dcf3d790
Add files via upload 2018-02-24 22:20:51 -06:00
BlueSilver22 4ba4c52a64
Delete whitepaper.docx 2018-02-24 23:20:43 -05:00
BlueSilver22 1d5d742d46
Delete whitepaper.pdf 2018-02-24 23:20:33 -05:00
BlueSilver22 166964d6dd
Add files via upload 2018-02-24 22:16:09 -06:00
Tam Tran 0923bc0995
Merge branch 'develop' into Countdown-Browser-fix 2018-02-24 16:30:47 -06:00
DREKLI f22346bb37 Countdown : Cross-browser fix
Noticed that there was an issue with css animations for Safari and iOS = dun not woikins.

So I've rebuilt the countdown using svg images instead. Kept it jQuery because the bulk of countdown.js was refactored to that.

Tested in Chrome, Safari, Firefox (all macOS).
2018-02-24 23:12:24 +01:00
Tam Tran 14742f5c65 Fixed ol for disclaimers 2018-02-24 07:28:43 -06:00
DREKLI 55ef262fa6 Disclaimer: Fix <ol> numbering 2018-02-24 09:42:54 +01:00
Tam Tran b18c7a2713 Merged develop 2018-02-23 14:31:00 -06:00
Tam Tran fdff1a111b updated disclaimer and thumbnail 2018-02-23 14:28:08 -06:00
Tam Tran 4a83332062 Updated disclaimer styling 2018-02-23 13:35:15 -06:00
Tam Tran 156b9eff30 Merge branch 'develop' of https://github.com/BTCP-community/bitcoinprivate-prefork-website into develop 2018-02-23 13:22:53 -06:00
Tam Tran 43ae14ccdd Removed countdown on disclaimer, updated team members, whitepaper 2018-02-23 13:20:54 -06:00
Matt Pass e1df9ca384
Remove Confetti.js from head of Disclaimer page 2018-02-23 19:13:54 +00:00
Matt Pass 2e54eaae06
Merge branch 'develop' into js_load_fix 2018-02-23 19:05:11 +00:00
Matt Pass 6280ab03a6
Merge branch 'develop' into js_load_fix 2018-02-23 19:03:52 +00:00
Tam Tran 59c06ad008 merged master back into dev 2018-02-23 13:03:30 -06:00
Tam Tran e80b19f2fb Merge branch 'master' into develop 2018-02-23 13:02:34 -06:00
DREKLI ee039963f6 Merge branch 'develop' of https://github.com/BTCP-community/bitcoinprivate-prefork-website into develop 2018-02-23 18:29:39 +01:00
DREKLI 92ac779ccb White paper localization #27 2018-02-23 18:29:35 +01:00
root f2535a0ca0 Fix for JS IIFE issue on non index.html pages 2018-02-23 17:27:51 +00:00
DREKLI 8355615f7c Create new disclaimer page #24 (and cleanup)
Added a new disclaimer page, with link on footer.

Cleanup:
- Footer changed to use 'container-fluid' and with a max width of max container width = using vanilla container was too small for menu
- Removed unneeded 'view-section' classes that were breaking links
- Remove some " target='_blank' " attrs on Team page
- Removed the large commented `Team` block on index.html
- Relinked "phone01.png" on business pages
2018-02-23 18:25:11 +01:00
root 054d521d56 Tweak meta tags on other 2 pages 2018-02-23 17:00:54 +00:00
root 237188b957 Updates to meta tags and card image used 2018-02-23 16:51:48 +00:00
BlueSilver22 1616fcd012
Add files via upload 2018-02-23 08:23:51 -06:00
root 320da89bad meta tags and thumbnail.png added 2018-02-23 13:20:48 +00:00
Tam Tran 325d96a012 Merge branch 'master' into develop 2018-02-22 09:40:25 -06:00
Tam Tran 6da2f600f7 removed sf from business 2018-02-22 08:30:20 -06:00
Tam Tran 2594597427 pulled master 2018-02-22 08:27:10 -06:00
Tam Tran a5cc0c7d12 Text changes per niel and giuseppe 2018-02-22 08:24:31 -06:00
DREKLI 29bdb88f34 Whitepaper CTA : btn colors
Added to helpers as it should be, and attached to .btn in original .splash.
2018-02-22 12:46:46 +01:00
DREKLI a887aed169 Whitepaper CTA : btn colors
Suggested improvement...

Primary color text with accent background to white background and primary border looks/feels like it breaks UX.

New background matches accent color...
https://color.adobe.com/create/color-wheel/?base=2&rule=Analogous&selected=0&name=My%20Color%20Theme&mode=rgb&rgbvalues=1,0.6784313725490196,0.0196078431372549,0.91,0.3530910211110139,0.04550000000000004,1,0,0,0.8063102981818213,0.04550000000000004,0.91,0.25392872727298943,0.050000000000000044,1&swatchOrder=0,1,2,3,4
2018-02-22 12:39:07 +01:00
DREKLI 4b5639f747 Snapshot & Block : var colors
Fixed all the colors to use the correct variables.
2018-02-22 12:32:05 +01:00
DREKLI a69a50167f Snapshot : Cleanup jumpy headers
Small fix for jumpy headers between block awaiting and snapshot.

Suggestion - remove #hero-based overrides (which was the issue) and move all text to rem rules to save hardcoding font-sizes between view sizes
2018-02-22 12:02:10 +01:00
root 81ec87908c Tidy up, jQuery elem sel, ternary's and nulls 2018-02-22 09:31:09 +00:00
DREKLI 79a5d457eb Snapshot & Block : Improvements
- Removed XMLHttpRequest requests, replaced with fetch

- Added test blocks.json for Countdown.js to read and see if there are blocks for ZCL and/or BTC (Usage: add or remove value to 'btc' to see working)

- Block elements visible for both 'Awaiting..' and 'Snapshot' views

- Icon missing from last commit

Now ready for MattPass to check functionality is still within the brief, then for us to test on CoinZap
2018-02-22 01:54:56 +01:00
DREKLI 2d4b7b02c9 Snapshot & Block : Improvements
Both
- Big fonts removed
- Responsively styled

Block (waiting)
- Bitcoin and ZClassic icons
- Initial steps to swap "Awaiting.." with found block
2018-02-21 23:22:40 +01:00
Tam Tran fbddfcfaed Updated localization 2018-02-21 15:37:41 -06:00
DREKLI d5bf6d2a68 Cleanup of image folders
Need to add some crypto logos for Snapshot, thought our image management could do with some loving first.
2018-02-21 19:03:17 +01:00
root 4cf6045e09 Killswitch added 2018-02-21 15:41:23 +00:00
Tam Tran db9c045f2b Updated cache buster for develop 2018-02-21 09:19:46 -06:00
Tam Tran a43fe6aced Removed duplicate code for white paper 2018-02-21 09:14:58 -06:00
Tam Tran b6d61dfb03 Merge branch 'master' into develop 2018-02-21 09:12:03 -06:00
root d509fd23a7 Clearer wording re blocks & snapshot 2018-02-21 08:34:53 +00:00
Giuseppe Stuto b29b7c45b4
Merge pull request #23 from johnbrett/master
[Work in progress]: Add /business page to the site
2018-02-20 20:48:39 -05:00
John Brett 04040b2c4a add email CTA 2018-02-21 01:43:32 +00:00
DREKLI 0137cb77d2 Countdown : Responsive styling
Helped out MattPass with his latest task...

Refactored the js, to
- Have cleaner structure in the html
- Remove the need for 'unit' and 'numbers' classes moving with the spinner changes = now only 3 elements get repositioned
- Mobile rules not needed anymore

- Cleaned up _countdown.scss (and nested core elements)

- Hid countdown logo on mobile to save it pushing everything down on tiny screens
2018-02-20 21:50:33 +01:00
John Brett df14cdd914 adding phone image 2018-02-20 17:42:45 +00:00
root 2fa2d815d3 whitepaper.pdf re-added 2018-02-20 13:08:06 +00:00
Matt Pass 2a95d75f70 Whitepaper update 2018-02-20 13:06:38 +00:00
root 2ffc113605 Get timeNow from XHR respoonse header 2018-02-20 12:35:36 +00:00
Matt Pass 7347416a37 Removed local-data.json 2018-02-20 12:30:57 +00:00
BlueSilver22 1eddec214b
Add files via upload 2018-02-19 22:35:58 -06:00
BlueSilver22 a7f5e8e4dc
Add files via upload 2018-02-19 22:33:18 -06:00
BlueSilver22 73f0853bff
Add files via upload 2018-02-19 20:54:40 -06:00
BlueSilver22 87b38361e9
Add files via upload 2018-02-19 19:44:15 -06:00
BlueSilver22 fa0d8b5c8b
Add files via upload 2018-02-19 19:28:48 -06:00
BlueSilver22 0be58a8a79
Add files via upload 2018-02-19 19:15:53 -06:00
John Brett 00fbb5d845
Merge branch 'master' into master 2018-02-20 01:05:24 +00:00
BlueSilver22 f49e19b81a
Add files via upload 2018-02-19 19:03:07 -06:00
BlueSilver22 6018bf34b1
Add files via upload 2018-02-19 19:02:06 -06:00
BlueSilver22 57e9765afb
Delete whitepaper.pdf 2018-02-19 20:01:54 -05:00
BlueSilver22 7dec83cc78
Add files via upload 2018-02-19 18:59:58 -06:00
BlueSilver22 0ace3b6688
Add files via upload 2018-02-19 18:56:36 -06:00
BlueSilver22 7626027772
Delete whitepaper.pdf 2018-02-19 19:56:15 -05:00
Tam Tran 2f4817acb9 updated buttons for white paper 2018-02-19 18:41:36 -06:00
Tam Tran e7a0a76d3f white paper 2018-02-19 18:31:52 -06:00
BlueSilver22 a9755774c7
Add files via upload 2018-02-19 18:19:59 -06:00
BlueSilver22 fc8595b6f8
Delete whitepaper.pdf 2018-02-19 19:08:45 -05:00
BlueSilver22 95975bc713
Add files via upload 2018-02-19 18:06:26 -06:00
John Brett 547347a921 update twitter CTA 2018-02-20 00:00:14 +00:00
BlueSilver22 5b4d0becd5
Delete whitepaper.pdf 2018-02-19 18:58:19 -05:00
John Brett f5a656d47f add why btcp page 2018-02-19 23:29:38 +00:00
John Brett c601597181 add first business component 2018-02-19 22:59:28 +00:00
Daniel Farina 511d954b90
Domain verification meta tag. 2018-02-19 14:41:13 -05:00
root 60b2e11fb4 Fixing all mainnet typos 2018-02-19 16:33:35 +00:00
Matt Pass 0dac91536c Final tidy up 2018-02-19 16:18:27 +00:00
Matt Pass c3d3afbb03 Tweaked wording, removed test button 2018-02-19 15:44:57 +00:00
Matt Pass f2be981ff7 local-data.json example added, to be updated via cronjob 2018-02-19 15:05:09 +00:00
Matt Pass fe41c30e53 Index page updated, header resources too 2018-02-19 15:04:39 +00:00
Matt Pass a23bd5bcb6 CSS updates to provide countdown also 2018-02-19 15:02:51 +00:00
Matt Pass c58d5f6aaa 2 x JS files added in src and docs 2018-02-19 15:01:28 +00:00
John Brett b58f6250d4 add business section 2018-02-18 16:09:21 +00:00
Tam Tran 0da74c9a84 Added lang=cz to team.html 2018-02-17 10:46:43 -06:00
Tam Tran f4fb7c3bcd Added localization 2018-02-17 10:44:37 -06:00
Tam Tran c6673a9f2f Removed extra htm file 2018-02-16 14:00:50 -06:00
Tam Tran 8696be35a7 Updated team and faq 2018-02-16 13:57:38 -06:00
Tam Tran c2066defcf Updated faq 2018-02-16 13:56:07 -06:00
J62 df6e5278a8 updated title 2018-02-14 15:58:17 -08:00
Tam Tran 0d98f66962 updated localization 2018-02-13 13:25:48 -06:00
Tam Tran 50fa0e4192 removed modal 2018-02-13 13:10:20 -06:00
Tam Tran d0d9483d01 Fixed menu 2018-02-13 10:43:15 -06:00
Tam Tran 41ef8626f4 updated localisation 2018-02-13 09:52:49 -06:00
Tam Tran 2cb31b0877 updated localization file 2018-02-13 08:42:29 -06:00
Tam Tran 6c8f54e107 Removed Tai and added Djoz 2018-02-12 12:27:38 -06:00
Tam Tran c19de773b4 Updated localization for support 2018-02-09 15:11:53 -06:00
Tam Tran f8b4d12743 updated Giu's role 2018-02-08 08:43:06 -06:00
Tam Tran 51714039bb Updated 70 to 200 2018-02-07 22:37:43 -06:00
Tam Tran 1d20457aa5 Updated team locations 2018-02-07 22:34:46 -06:00