Chuck Williams
e3a758c27f
Enables russian and chinese languages
2017-04-10 22:48:10 -06:00
Chuck Williams
cfd1ba0a20
Merge branch 'chuckwilliams37/master' of https://github.com/dashpay/dash-website into chuckwilliams37/master
...
* 'chuckwilliams37/master' of https://github.com/dashpay/dash-website :
invokes blog page build
fixes character issues in April 5th blog posts
# Conflicts:
# _i18n/en/_posts/2017-04-05-Enterprise.md
# _i18n/en/_posts/2017-04-05-finextra.md
# _i18n/en/_posts/2017-05-04-Enterprise.md
2017-04-10 22:42:12 -06:00
mr.wong
586dc6f52b
Revert "Revert "more fixes and edits""
2017-04-10 22:08:54 -06:00
mr.wong
7ca205a79c
Revert "more fixes and edits"
2017-04-10 22:08:54 -06:00
tungfa
3ed98dfa71
erased none working news posts
2017-04-10 22:08:54 -06:00
tungfa
a97a0aa04b
news posts
...
- fixed old
- posted new
2017-04-10 22:08:23 -06:00
tungfa
c6b76782ea
news posts
...
- fixed old
- posted new
2017-04-10 22:07:31 -06:00
tungfa
c2bfbc2535
4 news posts
2017-04-11 10:39:15 +08:00
mr.wong
2c48f4efbc
Merge pull request #232 from dashpay/revert-231-revert-230-master
...
Revert "Revert "more fixes and edits""
2017-04-09 15:45:08 +07:00
mr.wong
b6a31ac605
Revert "Revert "more fixes and edits""
2017-04-09 15:44:36 +07:00
mr.wong
ed198e300e
Merge pull request #231 from dashpay/revert-230-master
...
Revert "more fixes and edits"
2017-04-09 12:13:10 +07:00
mr.wong
bcadc4a945
Revert "more fixes and edits"
2017-04-09 12:12:43 +07:00
mr.wong
3aa77d8284
Merge pull request #230 from tungfa/master
...
more fixes and edits
2017-04-09 09:36:19 +07:00
tungfa
77c2eac359
Fixed Merchants _ email team
...
- erased dead merchant
- added new merchant
- fixed team email address
2017-04-09 10:18:48 +08:00
tungfa
8700231746
erased none working news posts
2017-04-09 10:07:31 +08:00
tungfa
1cf991c0f3
Merge remote-tracking branch 'dashpay/master'
2017-04-08 09:59:18 +08:00
tungfa
bea419c6f6
news posts
...
- fixed old
- posted new
2017-04-08 07:08:40 +08:00
tungfa
c5061a8416
news posts
...
- fixed old
- posted new
2017-04-08 07:06:35 +08:00
tungfa
1d2e562abb
Merge remote-tracking branch 'dashpay/master'
2017-04-07 14:44:20 +08:00
tungfa
02ee00d448
fixed news post
...
2017-05-04-DashPayDemo
2017-04-07 14:43:30 +08:00
tungfa
013ac273a3
fixed news post
...
2017-05-04-DashPayDemo
2017-04-07 14:42:42 +08:00
Chuck Williams
1ac202958b
fixes rss feed
2017-04-05 23:50:07 -06:00
Chuck Williams
49333a949f
Triggers build for blog page.
2017-04-05 23:32:12 -06:00
Chuck Williams
2997c36f03
Blog post cleanup: fixes bad/broken layout on blog page.
2017-04-05 23:31:22 -06:00
Chuck Williams
9e58eacb8d
Merge branch 'master' of https://github.com/dashpay/dash-website
...
* 'master' of https://github.com/dashpay/dash-website :
cleanup “&’s” in blog posts to assist w/ build
2017-04-05 23:12:45 -06:00
Chuck Williams
1f3bf02da4
cleanup “&’s” in blog posts to assist w/ build
2017-04-05 23:12:30 -06:00
Chuck Williams
cee6e54c4d
cleanup “&’s” in blog posts to assist w/ build
2017-04-05 23:11:00 -06:00
Chuck Williams
bdbabd532a
Merge branch 'chuckwilliams37/master' of https://github.com/dashpay/dash-website into chuckwilliams37/master
...
* 'chuckwilliams37/master' of https://github.com/dashpay/dash-website : (24 commits)
2 news posts
new merchant
Updated Team - Changed to official dash email
fixed all footer
3 news posts
renamed community page
fixed kiosk buttons
another team edit (+1 squashed commit) Squashed commits: [23c5dc0a8f839b5721369
2017-04-05 23:06:06 -06:00
Chuck Williams
3a9a65fb53
Merge cleanup
2017-04-05 23:05:50 -06:00
Chuck Williams
734ca4b059
new merchant
2017-04-05 23:04:23 -06:00
tungfa
2296480d23
2 news posts
2017-04-05 23:01:38 -06:00
tungfa
9851887110
2 new merchants
2017-04-05 23:00:37 -06:00
tungfa
5d2578daa1
new merchant
2017-04-05 22:59:51 -06:00
tungfa
f8670191db
edit fixed
2017-04-05 22:59:51 -06:00
tungfa
c16ff1b148
2 new merchants
2017-04-05 22:59:51 -06:00
tungfa
c7a4c73ecc
Team edit
2017-04-05 22:59:51 -06:00
Alex Werner
42da7b5691
Updated Team - Changed to official dash email
...
Have received my dash email address, this modification address this change.
2017-04-05 22:59:51 -06:00
tungfa
9c3adb44f5
3 news posts
2017-04-05 22:59:51 -06:00
Chuck Williams
d6385d9edb
Merge branch 'chuckwilliams37/master' of https://github.com/dashpay/dash-website into chuckwilliams37/master
...
* 'chuckwilliams37/master' of https://github.com/dashpay/dash-website :
2 news posts
new merchant
edit fixed
2 new merchants
new merchant
edit fixed
2 new merchants
Team edit
Updated Team - Changed to official dash email
fixed all footer
3 news posts
renamed community page
fixed kiosk buttons
another team edit
another team edit
fixed team order
fixed team order
2 new merchants
2 new merchants
2017-04-05 22:56:16 -06:00
tungfa
1c513e8255
2 news posts
2017-04-05 22:54:26 -06:00
Chuck Williams
87c3f32f60
new merchant
2017-04-05 22:53:55 -06:00
tungfa
26972486ae
Updated Team - Changed to official dash email
...
Have received my dash email address, this modification address this change. (+1 squashed commit)
Squashed commits:
[5d957ef
2017-04-05 22:52:38 -06:00
Lee Wong
905668f151
fixed all footer
2017-04-05 22:29:12 -06:00
tungfa
0f75046727
3 news posts
2017-04-05 22:29:11 -06:00
Lee Wong
865d0f5116
renamed community page
2017-04-05 22:29:11 -06:00
Lee Wong
0a0d95b448
fixed kiosk buttons
2017-04-05 22:29:11 -06:00
tungfa
3c292d40d9
another team edit (+1 squashed commit)
...
Squashed commits:
[23c5dc0
2017-04-05 22:29:11 -06:00
tungfa
a1f2570e56
fixed team order (+1 squashed commit)
...
Squashed commits:
[a8f839b
2017-04-05 22:29:11 -06:00
tungfa
97464d072b
2 new merchants (+1 squashed commit)
...
Squashed commits:
[5721369
2017-04-05 22:29:11 -06:00
tungfa
4541e4967e
2 news posts
2017-04-06 11:06:44 +08:00
