1151 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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] Team edit 2 new merchants new merchant 2 new merchants edit fixed	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] another team edit	2017-04-05 22:29:11 -06:00
tungfa	a1f2570e56	fixed team order (+1 squashed commit) ... Squashed commits: [a8f839b] fixed team order	2017-04-05 22:29:11 -06:00
tungfa	97464d072b	2 new merchants (+1 squashed commit) ... Squashed commits: [5721369] 2 new merchants	2017-04-05 22:29:11 -06:00
tungfa	4541e4967e	2 news posts	2017-04-06 11:06:44 +08:00
tungfa	fee8664b5e	Merge remote-tracking branch 'dashpay/master'	2017-04-06 10:49:41 +08:00
tungfa	ccee525f41	new merchant	2017-04-06 10:05:54 +08:00
tungfa	98629a24ba	edit fixed	2017-04-06 10:05:54 +08:00
tungfa	00eab41fd2	2 new merchants	2017-04-06 10:05:54 +08:00
tungfa	4ea7f34ff6	new merchant	2017-04-06 10:01:05 +08:00
tungfa	9b5b33110d	edit fixed	2017-04-06 09:43:38 +08:00
tungfa	f30ff66ac5	2 new merchants	2017-04-06 09:39:44 +08:00
tungfa	e91d8192b9	Merge remote-tracking branch 'dashpay/master'	2017-04-06 09:28:20 +08:00
mr.wong	e68ef6eb4e	Merge pull request #224 from Alex-Werner/awerner/master ... Updated Team - Changed to official dash email	2017-04-05 22:31:16 +07:00
mr.wong	056b45bd2c	Merge pull request #222 from tungfa/master ... news posts	2017-04-05 22:05:00 +07:00
tungfa	5d957ef0d2	Team edit	2017-04-05 08:13:47 +08:00
tungfa	0b4caf4531	Merge remote-tracking branch 'dashpay/master'	2017-04-05 08:10:24 +08:00
Alex Werner	3d0ee63273	Updated Team - Changed to official dash email ... Have received my dash email address, this modification address this change.	2017-04-04 19:45:45 +02:00
Lee Wong	4cc7fb8e20	fixed all footer	2017-04-05 00:26:39 +08:00
Lee Wong	c95c8ea447	fixed all footer	2017-04-04 22:24:52 +07:00
tungfa	db3fdf1f40	3 news posts	2017-04-04 19:44:22 +08:00
tungfa	23402f9c6f	Merge remote-tracking branch 'dashpay/master'	2017-04-04 17:31:25 +08:00
Lee Wong	fc49f5d512	renamed community page	2017-04-04 09:02:37 +08:00
Lee Wong	076da28084	fixed kiosk buttons	2017-04-04 09:02:37 +08:00
tungfa	7594998aa9	another team edit	2017-04-03 14:00:36 +08:00
tungfa	23c5dc085b	another team edit	2017-04-03 13:59:03 +08:00
tungfa	ac387a9fd8	Merge remote-tracking branch 'dashpay/master'	2017-04-03 13:53:43 +08:00
tungfa	81d7e24d36	fixed team order	2017-04-03 13:41:36 +08:00
tungfa	a8f839b4cd	fixed team order	2017-04-03 13:38:50 +08:00
tungfa	719b57ba96	Merge remote-tracking branch 'dashpay/master'	2017-04-03 11:07:30 +08:00
tungfa	ea128f6d40	2 new merchants	2017-04-03 08:59:49 +08:00
tungfa	57213695f5	2 new merchants	2017-04-03 08:56:43 +08:00
Lee Wong	b1e4132bef	merged	2017-04-02 22:41:26 +08:00
Lee Wong	3ded9ad1dd	merged	2017-04-02 22:41:26 +08:00
Lee Wong	9cf2d1d4ae	fixed validation for en.yml	2017-04-02 22:41:26 +08:00
Lee Wong	2054a177e0	merged	2017-04-02 22:41:26 +08:00
tungfa	2d2762671e	legal - edits	2017-04-02 10:38:12 +08:00
Lee Wong	8b3b0ebd9a	fixed legal page	2017-04-02 09:03:47 +08:00
Lee Wong	b85088cdca	Fixed legal page	2017-04-02 09:03:47 +08:00
Lee Wong	05dd295087	fixed legal page	2017-04-02 09:03:47 +08:00
Lee Wong	753bd73b38	Added initial statement for legal page	2017-04-02 09:03:47 +08:00