Commit graph

589 commits

Author SHA1 Message Date
tungfa
02be974b19 Merge remote-tracking branch 'dashpay/master' 2017-02-06 11:05:07 +08:00
Andy Freer
6be8eed26c Update: Blog - link images 2017-02-06 02:48:58 +00:00
Andy Freer
f6c6922338 Update: wallets - Coinomi control type 2017-02-06 02:46:38 +00:00
Andy Freer
6423415db7 Update Evo page: swap consumers and merchant sectons 2017-02-06 02:34:44 +00:00
Andy Freer
daadcd09ea Merge pull request #101 from andyfreer/master
Update WooCommerce and Evo pages
2017-02-06 02:29:37 +00:00
andyfreer
258d852239 Update: WooCommerce page content 2017-02-06 02:28:45 +00:00
andyfreer
aaaf8305a4 Update: Evo page image 2017-02-06 02:28:29 +00:00
tungfa
51b6c928cb Merge remote-tracking branch 'dashpay/master' 2017-02-06 09:50:47 +08:00
Andy Freer
f5aa35d17e Merge pull request #100 from Prtfw/master
PR
2017-02-06 01:47:58 +00:00
Madeleine Shang
ace9a7702d Merge remote-tracking branch 'upstream/master'
final merge before PR
2017-02-06 01:42:30 +00:00
Andy Freer
d7573dab95 Rename: dash binary d/l links to dashcore 2017-02-06 01:35:21 +00:00
Andy Freer
9794f0e2f7 Update: Route footer contact link to mailto
..until contact page is wired up
2017-02-06 01:27:12 +00:00
Andy Freer
0be669f99b Update merchants.html
Add woocommerce btn
2017-02-06 01:06:21 +00:00
Andy Freer
c53408e9be Update en.yml
Add woocommerce btn text
2017-02-06 01:05:28 +00:00
Andy Freer
366bba56cf Update _config.yml
Fix API link
2017-02-06 00:46:09 +00:00
Andy Freer
2294e56360 Merge pull request #99 from andyfreer/master
Update: Evolution page
2017-02-06 00:42:10 +00:00
andyfreer
ed2d55c6d9 Update: Evolution page 2017-02-06 00:40:31 +00:00
moocowmoo
a55de9d93b updated wiki href - new page 2017-02-06 00:39:39 +00:00
Madeleine Shang
c014270d0d Merge remote-tracking branch 'upstream/master'
merge for contact us link
2017-02-05 23:48:57 +00:00
Madeleine Shang
9365bdaf70 temp hide contact form and replace with contact us link 2017-02-05 23:48:43 +00:00
tungfa
6a030988a0 Merge remote-tracking branch 'dashpay/master' 2017-02-06 07:25:49 +08:00
Andy Freer
0e5f914530 Merge pull request #98 from andyfreer/master
Update: Wallets page info and modal content
2017-02-05 23:21:27 +00:00
andyfreer
a91446af47 Update: Wallets page info and modal content 2017-02-05 23:17:33 +00:00
Madeleine Shang
5d44f0e35f add success message + effect 2017-02-05 23:17:22 +00:00
Madeleine Shang
15aeb408c6 Merge remote-tracking branch 'upstream/master'
interim merge for commit (hooking up contact form)
2017-02-05 22:46:26 +00:00
Madeleine Shang
67c8d7923e hooking up the contact form, need to fininsh ajax request 2017-02-05 22:46:13 +00:00
tungfa
acf82e9f97 Merge remote-tracking branch 'dashpay/master' 2017-02-06 06:34:06 +08:00
tungfa
8763bf5342 4 new images (#97)
* fixed image color

fixed image color

* Fixed old post

needed an image

* back to original image

* 3 News Dev's Addeted

- fixed emails
- added 3 more dev

* team page + active link

- added details for the 3 newcomers
+ 1 pic
- download page / tried to make active link http://keepass.info

* change image

* 4 new News/Blog images

replacing better Blog images for old posts
2017-02-06 06:27:54 +08:00
tungfa
883fc7a8ea 4 new News/Blog images
replacing better Blog images for old posts
2017-02-06 06:27:13 +08:00
tungfa
2b5136758c Merge remote-tracking branch 'dashpay/master' 2017-02-06 06:17:36 +08:00
Andy Freer
e3b80ee955 Update: proposal gen link 2017-02-05 22:16:15 +00:00
tungfa
bb703b4c8b Merge remote-tracking branch 'dashpay/master' 2017-02-06 06:03:02 +08:00
tungfa
d1167e3aab fixed last image (#96)
* fixed image color

fixed image color

* Fixed old post

needed an image

* back to original image

* 3 News Dev's Addeted

- fixed emails
- added 3 more dev

* team page + active link

- added details for the 3 newcomers
+ 1 pic
- download page / tried to make active link http://keepass.info

* change image
2017-02-06 06:00:48 +08:00
tungfa
d943d2b995 change image 2017-02-06 05:59:48 +08:00
Andy Freer
a30e70db5e Add: Mobile Nav evo link 2017-02-05 20:56:49 +00:00
Andy Freer
f5dd2cdc25 Add: Nav evo link 2017-02-05 20:56:01 +00:00
Madeleine Shang
9df146815b Merge remote-tracking branch 'upstream/master'
merge with remove other lang from mobile and desktop nav bar for now
2017-02-05 20:55:38 +00:00
Madeleine Shang
225d114af9 remove other language options from mobile and desktop nav -for now 2017-02-05 20:55:24 +00:00
tungfa
8c2f8ae260 couple of things (#95)
* fixed image color

fixed image color

* Fixed old post

needed an image

* back to original image

* 3 News Dev's Addeted

- fixed emails
- added 3 more dev

* team page + active link

- added details for the 3 newcomers
+ 1 pic
- download page / tried to make active link http://keepass.info
2017-02-06 04:54:12 +08:00
tungfa
4ef15a89cc team page + active link
- added details for the 3 newcomers
+ 1 pic
- download page / tried to make active link http://keepass.info
2017-02-06 04:51:51 +08:00
tungfa
6845224479 Merge remote-tracking branch 'dashpay/master' 2017-02-06 04:47:49 +08:00
Madeleine Shang
af37699b4c 2nd 1/2 of broken link 2017-02-05 19:59:47 +00:00
Madeleine Shang
466803c723 Merge remote-tracking branch 'upstream/master'
interim merge from upstream
2017-02-05 18:51:56 +00:00
Madeleine Shang
7d3b828311 interim commit for link fix 2017-02-05 18:51:39 +00:00
Andy Freer
8a63380589 Merge pull request #94 from VitaliyTr/master
fixed wallet images if not core
2017-02-05 18:48:47 +00:00
VitaliyTr
2fbbcfec31 fixed wallet images if not core 2017-02-06 01:47:11 +07:00
Madeleine Shang
fae6e4de13 half done fixing broken links 2017-02-05 18:40:20 +00:00
Andy Freer
f4e4a6b156 Merge pull request #93 from VitaliyTr/master
removed label and fixed styles in main page
2017-02-05 17:48:12 +00:00
VitaliyTr
154fe60a28 removed label 2017-02-06 00:42:56 +07:00
Andy Freer
55ab237631 Update: blog.html
Removed as per issue #50
2017-02-05 17:41:44 +00:00