Commit Graph
28036 Commits
Author SHA1 Message Date
zenggang 189bc062b3 * Fix bug#15363 2021-09-30 16:17:48 +08:00
zenggang cc28a1a037 * Fix bug#14382 2021-09-30 14:53:36 +08:00
zenggang f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
zenggang 3efa133827 * Fix bug#15278 2021-09-29 10:59:27 +08:00
zenggang 5d37062ad6 * Fix bug#15359 2021-09-29 10:46:07 +08:00
Guan Xiying 610ab20e9e * Add public keywords to define helper::cd function. 2021-09-28 16:28:38 +08:00
朱金勇 8ef308be2f Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368

See merge request easycorp/zentaopms!35
2021-09-28 08:11:15 +00:00
zenggang d4ddac562d * Add code annotation 2021-09-28 15:56:43 +08:00
朱金勇 d31182c9f0 Merge branch 'sprint/165_sunguangming' into 'sprint/165'
* Fix bug #15335.

See merge request easycorp/zentaopms!33
2021-09-28 07:49:28 +00:00
朱金勇 79a020c0f5 Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.

See merge request easycorp/zentaopms!36
2021-09-28 07:46:19 +00:00
朱金勇 98f93d563d Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165'
* Finish task #42867.

See merge request easycorp/zentaopms!28
2021-09-28 07:42:48 +00:00
tianshujie 353bef2e83 * Finish task #42867. 2021-09-28 15:38:34 +08:00
朱金勇 aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!38
2021-09-28 07:37:30 +00:00
朱金勇 fa879ae303 Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!39
2021-09-28 07:35:23 +00:00
朱金勇 1173e8b65d Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong

See merge request easycorp/zentaopms!37
2021-09-28 07:31:10 +00:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
zenggang 57b48dd406 * Code for bug#15365 2021-09-28 11:20:05 +08:00
王怡栋 08f1d594c0 * adjust for task #42835. 2021-09-28 09:24:33 +08:00
dingna 5b5ae6dfdd * Finish task #42827. 2021-09-27 16:21:26 +08:00
zenggang 336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00
朱金勇 1bf1ac1156 Merge branch 'sprint/165_test' into 'sprint/165'
* Copy common folder to tmp.

See merge request easycorp/zentaopms!34
2021-09-27 07:30:03 +00:00
zhujinyong 1cf925a37c * Copy common folder to tmp. 2021-09-27 15:27:29 +08:00
tianshujie c5e340855d * Finish task #42867. 2021-09-27 15:12:59 +08:00
王怡栋 f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
朱金勇 978cfdbdc8 Merge branch 'sprint/165_test' into 'sprint/165'
* Init test framework

See merge request easycorp/zentaopms!32
2021-09-27 06:47:51 +00:00
孙广明 eada128988 * Fix bug #15335. 2021-09-27 14:32:33 +08:00
zhujinyong f1151c37c7 * Adjust code for test demo. 2021-09-27 14:05:51 +08:00
tianshujie 5e0068701e * Finish task #42867. 2021-09-27 13:55:09 +08:00
zhujinyong e059381d7d * Supply multiple config files. 2021-09-27 02:52:35 +08:00
朱金勇 452d4d8605 Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang

See merge request easycorp/zentaopms!27
2021-09-26 09:47:55 +00:00
朱金勇 f76d206ee5 Merge branch '165_tianshujie42861' into 'sprint/165'
* Finish task #42861.

See merge request easycorp/zentaopms!24
2021-09-26 09:45:24 +00:00
tianshujie 898d78514e * Finish task #42861. 2021-09-26 17:32:52 +08:00
tianshujie 48fb6fc46f * Finish task #42861. 2021-09-26 17:23:55 +08:00
zenggang 6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
朱金勇 98b74f4a94 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42832.

See merge request easycorp/zentaopms!22
2021-09-26 09:08:04 +00:00
zenggang 40d848f03f * Fix bug#15282 2021-09-26 17:06:13 +08:00
朱金勇 db1ec55d84 Merge branch 'spirnt/165_liyuchun_42860' into 'sprint/165'
* Finish task #42860.

See merge request easycorp/zentaopms!26
2021-09-26 08:57:41 +00:00
liyuchun 7dfa0963e6 * Finish task #42860. 2021-09-26 16:23:20 +08:00
tianshujie 62483636fd * Finish task #42861. 2021-09-26 15:11:50 +08:00
liyuchun 36a6d9f4e3 * Finish task #42834. 2021-09-26 14:43:28 +08:00
王怡栋 e9044ca0c9 * adjust for task #42832. 2021-09-26 12:11:44 +08:00
朱金勇 beaae9f167 Merge branch 'sprint/165_dingna_task42850' into 'sprint/165'
* Finish task #42850

See merge request easycorp/zentaopms!21
2021-09-26 04:01:53 +00:00
王怡栋 0d4c2da922 * finish task #42832. 2021-09-26 10:16:10 +08:00
dingna b416d20512 * Finish task #42850 Cost:0.5h 2021-09-26 09:51:02 +08:00
管西迎 04607e8a79 Merge branch 'sprint/165_test' into 'sprint/165'
* Send encrypted password when creating user by API.

See merge request easycorp/zentaopms!20
2021-09-24 06:56:37 +00:00
zhujinyong eb04910243 * Send encrypted password when creating user by API. 2021-09-24 14:50:27 +08:00
朱金勇 1bf7d48cdb Merge branch '165_dingna' into 'sprint/165'
* Finish task #42849.

See merge request easycorp/zentaopms!11
2021-09-24 05:11:12 +00:00
朱金勇 1f9ab6c380 Merge branch 'sprint/165_dingna_task42826' into 'sprint/165'
* Finish task #42826.

See merge request easycorp/zentaopms!19
2021-09-24 05:07:05 +00:00
朱金勇 f0c48a05f7 Merge branch 'sprint/165_dingna_task42851' into 'sprint/165'
* Finish task #42851.

See merge request easycorp/zentaopms!18
2021-09-24 05:06:33 +00:00