Commit Graph
101 Commits
Author SHA1 Message Date
liumengyi c11d0543ea * Fix bug #40359. 2023-11-08 16:58:11 +08:00
liumengyi 11e1225ad0 * Fix bug #40359. 2023-11-08 16:44:22 +08:00
tanghucheng 3835c48045 * Merge #d211e7474c,Fix bug #34956. 2023-11-07 01:43:02 -05:00
tanghucheng c7c6c21a52 * Merge #93b14b8f1e, Add activate product. 2023-10-31 04:37:59 -04:00
wangyidong a6eb1fac21 * Adjust for task #100333. 2023-08-17 16:34:18 +08:00
tianshujie 3670563f5b * Refactor manage product line. 2023-07-06 13:39:07 +08:00
chentao c41aca08a4 * Add translation of the data table to product list page. 2023-06-21 17:30:25 +08:00
wangyidong 6b22c3c9a8 * Code for task #94154. 2023-05-30 17:20:36 +08:00
wangyidong db5869c765 * Code for task #94153. 2023-05-30 17:20:36 +08:00
chentao c4460f420e * Add translation and change the style of 'Edit Product Line' button of the product list page. 2023-05-22 14:34:44 +08:00
chentao 96dc944004 * Fix translation of the data table column of product list page. 2023-05-19 15:23:10 +08:00
wangyidong b551b9ce24 * Refactor product manageLine page. 2023-05-15 11:27:50 +08:00
陈涛 47327e6f68 * fix bug. 2023-04-24 14:51:42 +08:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
liumengyi 66770f07c2 * Rename the privilege of product-project. 2023-04-13 17:12:53 +08:00
liumengyi f197999e42 - Delete the privilege of product-build. 2023-04-13 14:28:37 +08:00
王怡栋 f526a16291 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/custom/lang/zh-cn.php
2023-03-15 06:19:32 +00:00
tianshujie 5f6f52e86e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 10:57:18 +08:00
tianshujie bdc83c7088 * Modify product line language. 2023-03-15 10:54:45 +08:00
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
tianshujie cd925cee0e * Modify product line language. 2023-03-15 10:53:15 +08:00
hufangzhou 14f289ff97 * Finish task #87019. 2023-03-13 09:44:13 +00:00
tianshujie 13ce2eac8d * Fix bug #31975. 2023-03-09 10:32:05 +08:00
tianshujie 44b97bdab1 * Modify language items for project,product common. 2023-03-08 09:44:16 +08:00
tianshujie ae929617b0 * Modify language items for product common. 2023-03-07 13:13:50 +08:00
caoyanyi 9ed0c9a4f3 * Modify language for project common. 2023-03-06 15:53:45 +08:00
tianshujie 4d400723ce * Modify more select display method. 2023-03-03 15:54:33 +08:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
wangyidong 546cc63fb2 * code for task #84544. 2023-02-21 10:46:32 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liuhong 2204d0e30c * Adjust code #30172. 2022-11-24 06:34:11 +00:00
liuhong c91024ecf3 * Fix bug #30172 #30178. 2022-11-24 06:19:48 +00:00
liuhong 6f272700be * Fix bug #23269. 2022-11-23 00:48:31 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
hufangzhou 10c07b964f * Added empty row for alignment. 2022-10-19 06:06:26 +00:00
tianshujie e9eb4fe0c7 * Fix bug #28436. 2022-10-11 16:11:34 +08:00
tianshujie d29c43fef1 * Fix bug #28436. 2022-10-11 14:29:43 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie cc5e5d3c1d * Fix bug #28192. 2022-09-29 18:06:12 +08:00
曹延义 30973efa6a * Modify language. 2022-09-27 08:31:42 +08:00
曹延义 f23e60374f * Code for task #70490. 2022-09-26 14:01:25 +08:00
wangyidong a3b4211a4c * fix bug #27643. 2022-09-22 16:22:16 +08:00
tianshujie 6f9364520e * Fix bug #27503. 2022-09-19 09:21:09 +08:00
liugang fd873696f5 * Add lang items for the shadow field. 2022-09-14 10:40:40 +08:00
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
xieqiyu 6f18dfa4cc * Fix bug#26764. 2022-08-24 14:22:58 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00