Commit Graph
42977 Commits
Author SHA1 Message Date
Yagami 68becc48cd Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 08:59:43 +08:00
Yagami 93b14b8f1e * Add activate product. 2023-03-31 08:59:29 +08:00
tanghucheng 16c2dadb63 * Move the ipd correlation to zentaoext. 2023-03-30 13:17:43 +08:00
tanghucheng a2ee0edb63 * Code for task #89239. 2023-03-30 11:11:41 +08:00
tanghucheng 60f917c933 * Finish task #89242. 2023-03-30 10:20:44 +08:00
Yagami 563d612b21 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 16:47:56 +08:00
Yagami 38b1c0f417 * Fix bug #33474. 2023-03-29 16:47:39 +08:00
tanghucheng 10193e1e15 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 15:45:04 +08:00
tanghucheng b5d99d0ee1 * Fix bug #33485. 2023-03-29 15:44:49 +08:00
Yagami 6041f625df * Fix bug #33466. 2023-03-29 14:27:27 +08:00
Yagami 6d823f26aa Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-29 09:52:30 +08:00
Yagami 5563f06aa3 * Product's reviewer and PMT can view it. 2023-03-29 09:51:41 +08:00
tanghucheng 9d349da376 * Fix bug #33435. 2023-03-29 08:56:19 +08:00
Yagami 19f4ce44f3 Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-28 08:48:49 +08:00
Yagami 6a1540aba3 * Create product add vision. 2023-03-28 08:48:20 +08:00
tanghucheng 0d1a22ad71 * Finish task #87224. 2023-03-27 15:25:00 +08:00
Yagami 35614d6bfc * Finish task #88396. 2023-03-22 17:08:02 +08:00
tanghucheng 6a4189996a * Fix bug #33161. 2023-03-21 15:50:51 +08:00
tanghucheng 3cf4954c2c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-16 10:19:13 +08:00
wangyidong 103ef2810c * fix bug #32990. 2023-03-16 10:10:31 +08:00
wangyidong 3c19d401a7 * adjust for save editor. 2023-03-15 17:26:22 +08:00
wangyidong 21ef127eea * fix bug #32975. 2023-03-15 17:23:10 +08:00
王怡栋 fd5788438a Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7201
2023-03-15 09:20:39 +00:00
王怡栋 ee930f4cd9 Merge branch 'bugfix/32945_liumengyi' into 'master'
* Fix bug #32945.

See merge request easycorp/zentaopms!7200
2023-03-15 09:15:58 +00:00
王怡栋 1eca83bbb9 Merge branch 'bugfix/32640_liumengyi' into 'master'
* Fix bug #32640, #32618, #32465.

See merge request easycorp/zentaopms!7197
2023-03-15 09:15:43 +00:00
liumengyi f643f3bd93 * Fix bug #32945. 2023-03-15 08:44:01 +00:00
wangyidong 990a5c35bd * fix bug. 2023-03-15 16:38:48 +08:00
tianshujie 42bbd47348 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 16:20:59 +08:00
tianshujie fd18f8b1d1 * Fix bug 32972. 2023-03-15 16:20:05 +08:00
caoyanyi 03be35acd9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 16:12:40 +08:00
tianshujie e68579843f * Fix bug 32965. 2023-03-15 15:55:49 +08:00
tianshujie a051e5b3ff Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 15:41:11 +08:00
tianshujie a30fed01fa * Fix bug 32942. 2023-03-15 15:40:57 +08:00
wangyidong ce9340aef8 * fix bug #32946. 2023-03-15 15:36:16 +08:00
caoyanyi 39a55e9808 * Code for bug #32955. 2023-03-15 15:27:11 +08:00
tianshujie 0964904dda * Fix bug 32952. 2023-03-15 15:23:57 +08:00
liumengyi ee56283107 * Fix bug #32465. 2023-03-15 07:17:32 +00:00
liumengyi 6fc0fd1867 * Fix bug #32618. 2023-03-15 06:59:37 +00:00
tianshujie 56c5942ddf * Fix bug 32948. 2023-03-15 14:39:22 +08:00
liumengyi 19fe5417de * Fix bug #32640. 2023-03-15 06:34:32 +00:00
王怡栋 f526a16291 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/custom/lang/zh-cn.php
2023-03-15 06:19:32 +00:00
hufangzhou 047dfd6e54 * Fix bug #32940. 2023-03-15 14:09:10 +08:00
tanghucheng 8a3538fd6c * Code for task #87176. 2023-03-15 13:51:12 +08:00
孙广明 41538eb1db Merge branch 'feature/38477' into 'master'
* Fix bug of task #87014.

See merge request easycorp/zentaopms!7190
2023-03-15 05:38:41 +00:00
wangyidong ede15c92db * fix for upgrade for editor module. 2023-03-15 13:08:05 +08:00
管西迎 d0817bc8a0 Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.

See merge request easycorp/zentaopms!7193
2023-03-15 03:10:17 +00:00
tianshujie 07e2128147 * Modify program language. 2023-03-15 11:02:06 +08:00
tianshujie 445323e278 * Modify product line language. 2023-03-15 11:00:45 +08:00
tianshujie c513f5cb95 * Modify product line language. 2023-03-15 10:59:36 +08:00
tianshujie 5f6f52e86e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 10:57:18 +08:00