Commit graph

1181 commits

Author SHA1 Message Date
tungfa
4bb3bd37f8 Merge pull request #371 from mrleewong/master
New updates
2017-10-18 11:09:10 +08:00
Lee Wong
355461f47e DW-386 fixed spanish misspelling 2017-10-18 09:44:31 +07:00
Lee Wong
7fe55107aa DW-387 DW-388 DW-389 DW-390 DW-391 DW-392 DW-393 DW-394 DW-395 DW-396 DW-397 DW-398 DW-399 DW-400 DW-401 added news 2017-10-18 09:28:12 +07:00
Lee Wong
ddaab1d42e [DW-385] Changed logo for merchants 2017-10-17 23:06:14 +07:00
tungfa
534ca5949e Merge pull request #370 from mrleewong/master
DW-384 fixed dead link
2017-10-15 14:11:34 +08:00
Lee Wong
e381619c76 DW-384 fixed dead link 2017-10-15 11:12:29 +07:00
tungfa
d62ab599d8 Merge pull request #368 from mrleewong/master
DW-369 DW-370 DW-371 DW-372 DW-373 DW-374 DW-375 DW-376 DW-377 DW-378…
2017-10-12 07:17:51 +08:00
Lee Wong
c3c82b93eb DW-369 DW-370 DW-371 DW-372 DW-373 DW-374 DW-375 DW-376 DW-377 DW-378 DW-379 DW-380 DW-381 DW-382 DW-383 added new blog news; changed servers number on main page 2017-10-11 21:21:57 +07:00
tungfa
92d8ba082f Merge pull request #367 from mrleewong/master
Web site content changes
2017-10-11 07:53:24 +08:00
Lee Wong
0d1e4717fb DW-351 changed team hero image; DW-352 changed contact hero image 2017-10-10 22:59:16 +07:00
Lee Wong
e785f7c967 DW-350 updated links from network page 2017-10-10 22:06:56 +07:00
Lee Wong
89a3bebd78 DW-349 updated homepage info 2017-10-10 21:35:29 +07:00
tungfa
03c52dfeaf Merge pull request #365 from mrleewong/master
DW-348 DW-346 DW-345 DW-344 DW-343 DW-342 DW-341 added merchants; add…
2017-10-08 12:23:02 +08:00
Lee Wong
29c878df3f DW-348 DW-346 DW-345 DW-344 DW-343 DW-342 DW-341 added merchants; added exchange; added teammates 2017-10-08 10:29:55 +07:00
Nathan Marley
b2002496a6 Merge pull request #364 from mrleewong/master
added Ian; Fixed Williams photo
2017-10-05 09:24:48 -07:00
Lee Wong
db623fc623 added Ian; Fixed Williams photo 2017-10-05 23:10:38 +07:00
tungfa
a116d7143d Merge pull request #362 from mrleewong/master
DW-328 DW-329 DW-330 DW-331 DW-332 DW-333 DW-334 DW-335 DW-336 DW-337…
2017-10-04 10:59:21 +01:00
Lee Wong
a97ccd8d67 DW-328 DW-329 DW-330 DW-331 DW-332 DW-333 DW-334 DW-335 DW-336 DW-337 DW-338 added news 2017-10-04 16:35:33 +07:00
tungfa
f4d77e90da Merge pull request #361 from mrleewong/master
DW-339 added new team members
2017-10-04 03:08:01 +01:00
Lee Wong
007491bcaf DW-339 added new teammembers 2017-10-04 08:52:48 +07:00
mr.wong
36a4085318 Merge pull request #358 from dashpay/revert-345-buydash
Revert "added buy dash"
2017-10-03 21:02:34 +07:00
mr.wong
9b540f786c Revert "added buy dash" 2017-10-03 20:24:16 +07:00
tungfa
66ccd76598 Merge pull request #357 from mrleewong/master
DW-326 changed github link to coinomi website
2017-10-03 04:41:42 +01:00
Lee Wong
65f1b39bf9 DW-326 changed github link to coinomi website 2017-10-03 07:22:38 +07:00
Nathan Marley
07028659bb Merge pull request #356 from nmarley/fix-release
fix release deploy
2017-10-01 11:01:19 -07:00
Nathan Marley
95c1350f4a fix release deploy 2017-10-01 10:47:18 -07:00
Nathan Marley
16776395ec Merge pull request #355 from nmarley/release
deploy to prod on release branch
2017-10-01 09:58:14 -07:00
Nathan Marley
a04fcc4230 deploy to prod on release branch 2017-10-01 09:40:24 -07:00
Nathan Marley
e5035d771c Merge pull request #354 from nmarley/fix-deploy
clean up / simplify deploy
2017-10-01 10:54:12 +08:00
Nathan Marley
b5d4345f3f spell rsync correctly 2017-09-30 19:38:23 -07:00
Nathan Marley
c4d03b48af clean up / simplify deploy 2017-09-30 18:54:28 -07:00
Nathan Marley
eae7ec9caf Merge pull request #352 from nmarley/DW-325-ssh-key
DW-325 stop serving encrypted deploy SSH key
2017-10-01 08:24:57 +08:00
Nathan Marley
623f875173 DW-325 stop serving encrypted deploy SSH key 2017-09-30 16:57:51 -07:00
Nathan Marley
eade475b83 Merge pull request #351 from nmarley/DW-324-robots
DW-324 add robots.txt to repo
2017-10-01 07:50:52 +08:00
Nathan Marley
244449cfcd DW-324 add robots.txt to repo 2017-09-30 16:00:04 -07:00
Nathan Marley
41ff3ae9ff Merge pull request #350 from nmarley/DW-323-favicon
DW-323 add favicon to repository
2017-10-01 05:56:26 +08:00
Nathan Marley
1486e72f49 DW-323 add favicon to repository 2017-09-30 11:05:55 -07:00
Nathan Marley
78a718da06 Merge pull request #345 from mrleewong/buydash
added buy dash
2017-10-01 00:10:26 +08:00
Nathan Marley
1e08b77336 Merge pull request #348 from nmarley/OPS-33-docker-build
OPS-33 docker build
2017-09-30 23:57:33 +08:00
Lee Wong
875468df5c DW-288 DW-289 DW-290 DW-291 DW-295 DW-296 DW-297 DW-298 DW-300 DW-301 DW-302 DW-303 DW-304 DW-305 DW-306 DW-307 DW-308 DW-309 DW-310 DW-311 DW-312 DW-313 DW-314 DW-314 DW-315 DW-316 DW-317 DW-318 DW-319 DW-320 DW-321 DW-322 added new posts; exchanges; meerchants 2017-09-30 13:42:00 +01:00
Nathan Marley
dba173f5d9 update travis settings 2017-09-29 09:45:56 +01:00
Nathan Marley
b1d128a7c9 build site using docker 2017-09-29 09:45:56 +01:00
Nathan Marley
250439df3b Merge pull request #347 from nmarley/DW-294-ignore-cibuild
DW-294 jekyll ignore cibuild script
2017-09-29 16:44:52 +08:00
Nathan Marley
c98c4346b1 DW-294 jekyll ignore cibuild script 2017-09-28 20:40:46 +01:00
Nathan Marley
39bd945bf0 Merge pull request #346 from nmarley/docker
dockerize for deterministic site builds
2017-09-29 03:25:48 +08:00
Lee Wong
2b1b25063f added buy dash 2017-09-28 19:07:00 +07:00
Nathan Marley
677474cfd2 dockerignore non-build files 2017-09-28 09:56:15 +01:00
Nathan Marley
b3b0a259cd dockerize for deterministic site builds 2017-09-27 16:39:26 +01:00
Nathan Marley
1bb814cda4 add bundle exec for ruby commands
* This is currently used in our production site deploy and should be
  used to ensure our local bundle Gem version(s) are used and not
  conflicting system versions. This is dependency isolation.
2017-09-27 22:36:08 +07:00
Nathan Marley
ac8d35c722 add Gemfile.lock to git tracking
* We want to continue to include this in the future to ensure dependency
  version updates don't break our site. This is the purpose of .lock
  files.
2017-09-27 22:36:08 +07:00