Commit Graph

1392 Commits

Author SHA1 Message Date
Jasder 480cfb66b1 Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops 2020-08-15 19:57:35 +08:00
Jasder b233586779 FIX merge 2020-08-15 19:57:20 +08:00
Jasder a9a0cab7d1 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 19:53:05 +08:00
Jasder 7a3f8cf47f FIX migrate api bug 2020-08-15 19:52:58 +08:00
sylor_huang@126.com 8fd167b578 Merge branch 'dev_trustie' into dev_devops 2020-08-15 15:04:24 +08:00
sylor_huang@126.com 1bfcc466fe change 2020-08-15 15:04:09 +08:00
sylor_huang@126.com 09802819b8 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:50:12 +08:00
sylor_huang@126.com fae9df56a4 cahnge 2020-08-15 14:49:52 +08:00
sylor_huang@126.com 2979eaaeb4 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:48:42 +08:00
sylor_huang@126.com 531b66e862 Change 2020-08-15 14:48:12 +08:00
sylor_huang@126.com bc8240b772 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:35:52 +08:00
sylor_huang@126.com b1d974c362 Change 2020-08-15 14:35:31 +08:00
sylor_huang@126.com 372687e509 Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:49:52 +08:00
sylor_huang@126.com e092c1f222 Change 2020-08-15 13:49:36 +08:00
sylor_huang@126.com a7b096d00e Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:36:03 +08:00
sylor_huang@126.com 5f3f6748f2 Change 2020-08-15 13:34:32 +08:00
sylor_huang@126.com 2267872076 Chnage 2020-08-15 13:30:44 +08:00
sylor_huang@126.com 929b56629c Change 2020-08-15 13:28:22 +08:00
sylor_huang@126.com 2154892a0b Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:27:32 +08:00
sylor_huang@126.com 0aa46815f2 Change Project Id 2020-08-15 13:27:13 +08:00
Jasder a8522edaa9 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 13:24:52 +08:00
Jasder ebce182b7e Merge branch 'dev_change_route' into dev_trustie 2020-08-15 13:24:29 +08:00
sylor_huang@126.com 0af359ec0c Change 2020-08-15 13:21:33 +08:00
sylor_huang@126.com a0d287b1df Change 2020-08-15 12:50:04 +08:00
sylor_huang@126.com 466bdedfcd Change 2020-08-15 12:40:31 +08:00
sylor_huang@126.com e1c49c0ba8 Change 2020-08-15 12:38:25 +08:00
sylor_huang@126.com aa0f7ff873 Change 2020-08-15 12:37:26 +08:00
sylor_huang@126.com 5aff092a35 Change 2020-08-15 12:35:56 +08:00
Jasder fb733722d6 Merge branch 'dev_change_route' into dev_devops 2020-08-15 11:06:04 +08:00
Jasder ec43c03f08 FIX bug 2020-08-15 11:05:20 +08:00
Jasder ef285f54c6 Merge branch 'dev_change_route' into dev_devops 2020-08-15 10:59:42 +08:00
Jasder 8b9f0a9f06 FIX projects fork users bug 2020-08-15 10:59:29 +08:00
Jasder 90f14d2051 FIX projects fork users bug 2020-08-15 10:58:56 +08:00
Jasder bd9f32cfaa Merge branch 'dev_change_route' into dev_devops 2020-08-15 10:26:47 +08:00
Jasder b7b096d6d7 FIX password length validate 2020-08-15 10:26:30 +08:00
Jasder dac91f9a0c Merge branch 'dev_change_route' into dev_devops 2020-08-14 23:25:10 +08:00
Jasder 0cd790ecac fix js redirect 2020-08-14 23:24:54 +08:00
Jasder 0c64b36fab FIX merge 2020-08-14 22:17:09 +08:00
Jasder c4a92fe4a4 FIX login bug 2020-08-14 22:16:24 +08:00
Jasder 775c27a45b FIX login bug 2020-08-14 22:14:59 +08:00
Jasder 10adc42257 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:05:35 +08:00
Jasder 17da5fad38 ADD log 2020-08-14 22:05:22 +08:00
Jasder 58d0044764 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:00:52 +08:00
Jasder 17183d8769 FIX 2020-08-14 22:00:37 +08:00
Jasder 652654e606 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:57:10 +08:00
Jasder 675c380967 FIX 2020-08-14 21:56:16 +08:00
Jasder f7db9c0892 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:53:25 +08:00
Jasder c38b073715 FIX validat bug 2020-08-14 21:53:11 +08:00
Jasder 07edd5f8b4 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:49:47 +08:00
Jasder 93dabf9f06 FIX 2020-08-14 21:49:33 +08:00