Commit Graph

2768 Commits

Author SHA1 Message Date
sylor_huang@126.com 6d6294419d chang bugs 2020-07-10 14:05:37 +08:00
sylor_huang@126.com 66beab3457 s 2020-07-10 11:54:30 +08:00
sylor_huang@126.com a20cb9eb5b Merge branch 'dev_trustie' into dev_chain 2020-07-10 11:53:49 +08:00
sylor_huang@126.com c2e1fa27df change bugs 2020-07-10 11:53:30 +08:00
sylor_huang@126.com aebaa7deda change bugs 2020-07-10 11:42:38 +08:00
sylor_huang@126.com 0db202585b change bugs 2020-07-10 11:15:04 +08:00
sylor_huang@126.com 2b7dec7f56 change bugs 2020-07-10 11:14:08 +08:00
sylor_huang@126.com 8860a584ca change bugs 2020-07-10 11:13:27 +08:00
sylor_huang@126.com 6395dad2f1 change bugs 2020-07-10 11:11:54 +08:00
sylor_huang@126.com 28f777f5eb Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:58:58 +08:00
sylor_huang@126.com 77d0b89215 change bugs 2020-07-10 10:58:39 +08:00
sylor_huang@126.com 066a720525 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:53:15 +08:00
sylor_huang@126.com 087550797b change bugs 2020-07-10 10:52:44 +08:00
sylor_huang@126.com a6a65eb4c8 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:21:02 +08:00
sylor_huang@126.com 5aef64a928 change bugs 2020-07-10 10:20:37 +08:00
sylor_huang@126.com 2664be17f9 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:10:36 +08:00
sylor_huang@126.com 99947f17d1 change bugs 2020-07-10 10:09:59 +08:00
sylor_huang@126.com cd32b7e300 Merge branch 'dev_trustie' into dev_chain 2020-07-10 09:53:33 +08:00
sylor_huang@126.com 4aec62fc33 change bugs 2020-07-10 09:53:13 +08:00
sylor_huang@126.com ac2b8c9f65 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:58:11 +08:00
sylor_huang@126.com 804e971314 change bugs 2020-07-09 20:57:49 +08:00
sylor_huang@126.com dcbbf66e61 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:40:59 +08:00
sylor_huang@126.com 2916b1098e change bugs 2020-07-09 20:40:35 +08:00
sylor_huang@126.com c6c7f0968b change bugs 2020-07-09 20:37:43 +08:00
sylor_huang@126.com 97844c47d7 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:36:49 +08:00
sylor_huang@126.com 9e15f2c733 Change bugs 2020-07-09 20:36:27 +08:00
sylor_huang@126.com 265562a260 change bugs 2020-07-09 20:33:18 +08:00
sylor_huang@126.com 7724c1bcce Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:24:53 +08:00
sylor_huang@126.com e06a2ec0f0 change bugs 2020-07-09 20:24:02 +08:00
sylor_huang@126.com 946a5cc44a Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:18:44 +08:00
sylor_huang@126.com f3392e0aeb change bugs 2020-07-09 20:17:49 +08:00
sylor_huang@126.com a78ba32923 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:57:50 +08:00
sylor_huang@126.com 43f39b6a01 change bugs 2020-07-09 19:57:24 +08:00
sylor_huang@126.com 704dda3a1c Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:47:03 +08:00
sylor_huang@126.com 55b4ec2aa7 change bugs 2020-07-09 19:46:42 +08:00
sylor_huang@126.com 7fdc61040c Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:43:39 +08:00
sylor_huang@126.com dbfef20434 change bugs 2020-07-09 19:43:17 +08:00
sylor_huang@126.com 7df67ebca6 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:33:27 +08:00
sylor_huang@126.com 20ac55a323 change bugs 2020-07-09 19:33:02 +08:00
sylor_huang@126.com bf85203a25 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:30:43 +08:00
sylor_huang@126.com 98ec2d0b3c change bugs 2020-07-09 19:30:15 +08:00
sylor_huang@126.com 62ab4805a2 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:27:55 +08:00
sylor_huang@126.com 7ee556cd6c change bugs 2020-07-09 19:27:36 +08:00
sylor_huang@126.com 9e2181392b Merge branch 'dev_trustie' into dev_chain 2020-07-09 17:52:09 +08:00
sylor_huang@126.com 4fa545c681 add sync logs 2020-07-09 17:51:38 +08:00
sylor_huang@126.com bcd6ffdfda Merge branch 'dev_trustie' into dev_chain 2020-07-09 16:47:55 +08:00
sylor_huang@126.com b340de89c7 qianyi datas 2020-07-09 16:46:57 +08:00
Jasder dbafd32d0b Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-07 16:08:18 +08:00
Jasder df6bddfb8d FIX actioncable job 2020-07-07 16:08:10 +08:00
sylor_huang@126.com b9a596bb2c Merge branch 'dev_trustie' into dev_chain 2020-07-07 13:55:17 +08:00