sylor_huang@126.com
|
b26059bf48
|
change bugs
|
2020-07-15 21:15:40 +08:00 |
|
sylor_huang@126.com
|
bc82451fcc
|
Change
|
2020-07-15 18:02:43 +08:00 |
Jasder
|
8f96341679
|
FIX merge dev_trustie conflict
|
2020-07-15 17:16:41 +08:00 |
|
Jasder
|
0a2423e912
|
Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
|
2020-07-15 17:13:49 +08:00 |
|
Jasder
|
b9abd6a152
|
FIX 插销掉dev_chain分支的合并
|
2020-07-15 17:13:16 +08:00 |
|
sylor_huang@126.com
|
6c116042f2
|
change bugs
|
2020-07-15 17:08:02 +08:00 |
|
Jasder
|
43b413706c
|
Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
|
2020-07-15 17:03:03 +08:00 |
|
sylor_huang@126.com
|
e97d66bf30
|
add exists check
|
2020-07-15 15:43:02 +08:00 |
|
Jasder
|
e0ae7b2aec
|
Merge branch 'dev_trustie' into dev_devops
|
2020-07-15 09:44:55 +08:00 |
|
Jasder
|
56bd4f6503
|
Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
|
2020-07-15 09:44:25 +08:00 |
|
sylor_huang@126.com
|
ae037203e8
|
change bugs
|
2020-07-14 22:44:58 +08:00 |
|
sylor_huang@126.com
|
2e7d0abcbf
|
change
|
2020-07-14 22:05:43 +08:00 |
|
sylor_huang@126.com
|
5c28ad9c0a
|
change trustie-proejcts
|
2020-07-14 19:27:36 +08:00 |
|
Jasder
|
2b6fe8f9a8
|
FIX merge
|
2020-07-14 15:15:50 +08:00 |
|
Jasder
|
fbb7fa34e3
|
Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie
|
2020-07-14 15:11:40 +08:00 |
|
sylor_huang@126.com
|
944e5de8c6
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-14 14:25:26 +08:00 |
|
sylor_huang@126.com
|
f820250ad0
|
change branches
|
2020-07-14 14:25:02 +08:00 |
|
sylor_huang@126.com
|
afd49eabdc
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-14 14:15:49 +08:00 |
|
sylor_huang@126.com
|
5f4dc22625
|
change branches
|
2020-07-14 14:15:16 +08:00 |
|
sylor_huang@126.com
|
b0e6646c8e
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-14 13:57:02 +08:00 |
|
sylor_huang@126.com
|
753cc44518
|
change bugs
|
2020-07-14 13:56:41 +08:00 |
|
sylor_huang@126.com
|
dd2c70fcee
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-14 13:46:28 +08:00 |
|
sylor_huang@126.com
|
6220a3c05a
|
change branches
|
2020-07-14 13:45:52 +08:00 |
|
sylor_huang@126.com
|
0eb1abf850
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-14 11:27:59 +08:00 |
|
sylor_huang@126.com
|
e97f2e6444
|
change sync
|
2020-07-14 11:27:37 +08:00 |
|
sylor_huang@126.com
|
eb46496fb1
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 21:01:33 +08:00 |
|
sylor_huang@126.com
|
ef439aca5f
|
change
|
2020-07-13 21:01:13 +08:00 |
|
sylor_huang@126.com
|
d12fc65da5
|
chang
|
2020-07-13 20:58:48 +08:00 |
|
sylor_huang@126.com
|
2e8095af58
|
change bugs
|
2020-07-13 20:20:30 +08:00 |
|
sylor_huang@126.com
|
4417f8c070
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 13:54:48 +08:00 |
|
sylor_huang@126.com
|
49be881914
|
change bugs
|
2020-07-13 13:54:27 +08:00 |
|
sylor_huang@126.com
|
224b7c7cd4
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 11:49:25 +08:00 |
|
sylor_huang@126.com
|
4dd8ac5cd0
|
change bugs
|
2020-07-13 11:49:02 +08:00 |
|
sylor_huang@126.com
|
86c63e39a0
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 11:08:37 +08:00 |
|
sylor_huang@126.com
|
e6d5d518f7
|
change bugs
|
2020-07-13 11:08:13 +08:00 |
|
sylor_huang@126.com
|
27ee469d24
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 10:58:53 +08:00 |
|
sylor_huang@126.com
|
83da924565
|
add member roles
|
2020-07-13 10:58:30 +08:00 |
|
sylor_huang@126.com
|
aac959fc64
|
change bugs
|
2020-07-13 10:08:46 +08:00 |
|
sylor_huang@126.com
|
2ccf667f20
|
change bugs
|
2020-07-13 10:08:20 +08:00 |
|
sylor_huang@126.com
|
2632cbb010
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-13 09:50:52 +08:00 |
|
sylor_huang@126.com
|
22e624abce
|
change bugs
|
2020-07-13 09:49:54 +08:00 |
|
sylor_huang@126.com
|
71edf8366d
|
change error
|
2020-07-13 09:48:05 +08:00 |
|
sylor_huang@126.com
|
2941652375
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 21:13:44 +08:00 |
|
sylor_huang@126.com
|
684b1a46cb
|
change bugs
|
2020-07-10 21:13:18 +08:00 |
|
sylor_huang@126.com
|
94cd6202a9
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 21:09:25 +08:00 |
|
sylor_huang@126.com
|
6c5133ca0a
|
change bugs
|
2020-07-10 21:09:02 +08:00 |
|
sylor_huang@126.com
|
3fe0c4752f
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 20:43:12 +08:00 |
|
sylor_huang@126.com
|
b8de6a9d10
|
change bugs
|
2020-07-10 20:42:51 +08:00 |
|
sylor_huang@126.com
|
7bd053a9b2
|
change bugs
|
2020-07-10 20:40:28 +08:00 |
|
sylor_huang@126.com
|
9a1db03dca
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 20:20:43 +08:00 |
|
sylor_huang@126.com
|
f6a9d1f54a
|
change bugs
|
2020-07-10 20:20:20 +08:00 |
|
sylor_huang@126.com
|
ab2fe592ec
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 20:10:48 +08:00 |
|
sylor_huang@126.com
|
4aeb79de1a
|
change bugs
|
2020-07-10 20:10:16 +08:00 |
|
sylor_huang@126.com
|
bb97f33732
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 20:04:03 +08:00 |
|
sylor_huang@126.com
|
edcc6e07ee
|
change bugs
|
2020-07-10 20:03:30 +08:00 |
|
sylor_huang@126.com
|
bfb437ae3e
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:56:24 +08:00 |
|
sylor_huang@126.com
|
a772d919ce
|
change bugs
|
2020-07-10 19:55:59 +08:00 |
|
sylor_huang@126.com
|
3c66b92e90
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:50:20 +08:00 |
|
sylor_huang@126.com
|
9ece830b00
|
change bugs
|
2020-07-10 19:49:58 +08:00 |
|
sylor_huang@126.com
|
9e310f992e
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:44:21 +08:00 |
|
sylor_huang@126.com
|
5dafeb8103
|
change bugs
|
2020-07-10 19:43:59 +08:00 |
|
sylor_huang@126.com
|
ce11dbba2e
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:37:54 +08:00 |
|
sylor_huang@126.com
|
1e9a3e3012
|
change bugs
|
2020-07-10 19:37:34 +08:00 |
|
sylor_huang@126.com
|
6db500c0a6
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:25:39 +08:00 |
|
sylor_huang@126.com
|
a6f67edd26
|
change bugs
|
2020-07-10 19:25:18 +08:00 |
|
sylor_huang@126.com
|
569a68e199
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 19:20:57 +08:00 |
|
sylor_huang@126.com
|
b71de602e0
|
change bugs
|
2020-07-10 19:20:39 +08:00 |
|
sylor_huang@126.com
|
ed80de25f3
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 18:44:25 +08:00 |
|
sylor_huang@126.com
|
29fd6be9b0
|
change bugs
|
2020-07-10 18:44:01 +08:00 |
|
sylor_huang@126.com
|
2e2b4a9469
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 18:12:28 +08:00 |
|
sylor_huang@126.com
|
deaaed0527
|
change bugs
|
2020-07-10 18:12:10 +08:00 |
|
sylor_huang@126.com
|
4b8563db5d
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 18:03:29 +08:00 |
|
sylor_huang@126.com
|
581f5b777a
|
change bugs
|
2020-07-10 18:03:09 +08:00 |
|
sylor_huang@126.com
|
b936e0a3e8
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 17:47:30 +08:00 |
|
sylor_huang@126.com
|
bf61c0e5b3
|
change bugs
|
2020-07-10 17:46:56 +08:00 |
|
sylor_huang@126.com
|
ee95464033
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 17:36:36 +08:00 |
|
sylor_huang@126.com
|
f4be93c340
|
change bugs
|
2020-07-10 17:36:15 +08:00 |
|
sylor_huang@126.com
|
7415fa2b3c
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 17:20:44 +08:00 |
|
sylor_huang@126.com
|
e0d9bfab6d
|
change bugs
|
2020-07-10 17:20:13 +08:00 |
|
sylor_huang@126.com
|
f4e1414f2a
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 17:05:16 +08:00 |
|
sylor_huang@126.com
|
65b03f7c71
|
change main
|
2020-07-10 17:04:53 +08:00 |
|
sylor_huang@126.com
|
3746db7fde
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 17:00:17 +08:00 |
|
sylor_huang@126.com
|
147fdb0d05
|
change main
|
2020-07-10 16:59:54 +08:00 |
|
sylor_huang@126.com
|
06e914f398
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 16:51:51 +08:00 |
|
sylor_huang@126.com
|
7a0106578b
|
change jobs
|
2020-07-10 16:51:29 +08:00 |
|
sylor_huang@126.com
|
7d76c6c85f
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 16:32:33 +08:00 |
|
sylor_huang@126.com
|
661a7d5105
|
change sync
|
2020-07-10 16:32:08 +08:00 |
|
sylor_huang@126.com
|
1c482761cf
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 16:25:27 +08:00 |
|
sylor_huang@126.com
|
6e31352f8d
|
change sync
|
2020-07-10 16:25:03 +08:00 |
|
sylor_huang@126.com
|
4893edd6c1
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-10 15:56:16 +08:00 |
|
sylor_huang@126.com
|
8c1aedc6bd
|
change sync
|
2020-07-10 15:54:04 +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
|
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
|
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
|
df6bddfb8d
|
FIX actioncable job
|
2020-07-07 16:08:10 +08:00 |
|
Jasder
|
1541cb4fc3
|
Merge branch 'dev_trustie' into dev_chain
|
2020-07-02 15:52:15 +08:00 |
|
Jasder
|
c1a5c390f7
|
ADD action cable for migrate project
|
2020-07-02 15:49:22 +08:00 |