Commit Graph

361 Commits

Author SHA1 Message Date
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
sylor_huang@126.com
8a1abaed8a change 2020-07-06 16:35:03 +08:00
sylor_huang@126.com
153496c089 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:37:33 +08:00
sylor_huang@126.com
d92c57c1b9 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-03 17:36:38 +08:00
sylor_huang@126.com
3594ea01d2 show commmits 2020-07-03 17:35:35 +08:00
Jasder
3cae1d4eb7 FIX merge pr bug for gitea platform 2020-07-03 17:35:34 +08:00
sylor_huang@126.com
c96dcb14e7 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:15:15 +08:00
sylor_huang@126.com
2ecb227c30 change error 2020-07-03 17:14:20 +08:00
sylor_huang@126.com
d812929152 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:01:16 +08:00
sylor_huang@126.com
8f6b455a95 change pr codes 2020-07-03 17:00:55 +08:00
Jasder
385abd53b7 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-03 16:23:21 +08:00
Jasder
795e06f6c5 FIX merge pr's bug 2020-07-03 16:23:06 +08:00
sylor_huang@126.com
943d14ebfe change errors 2020-07-03 16:23:04 +08:00
sylor_huang@126.com
6d536aae62 change errors 2020-07-03 16:22:23 +08:00
sylor_huang@126.com
73d3715cca change 2020-07-03 16:17:06 +08:00
sylor_huang@126.com
21417ad300 Merge branch 'dev_trustie' into dev_chain 2020-07-03 16:13:24 +08:00
sylor_huang@126.com
7995a82d6a 修改commits 2020-07-03 16:13:01 +08:00
sylor_huang@126.com
8eb3b149d7 Merge branch 'dev_trustie' into dev_chain 2020-07-03 15:26:46 +08:00
sylor_huang@126.com
281889ebae change counts 2020-07-03 15:14:25 +08:00
Jasder
1541cb4fc3 Merge branch 'dev_trustie' into dev_chain 2020-07-02 15:52:15 +08:00
Jasder
04f98f1c10 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-02 15:50:50 +08:00
Jasder
c1a5c390f7 ADD action cable for migrate project 2020-07-02 15:49:22 +08:00
sylor_huang@126.com
2e3438d75b Merge branch 'dev_trustie' into dev_chain 2020-07-02 15:00:43 +08:00
sylor_huang@126.com
7e99c0fc88 change some bug 2020-07-02 15:00:17 +08:00
sylor_huang@126.com
964e015588 Merge branch 'dev_trustie' into dev_chain 2020-06-30 18:49:37 +08:00