Commit Graph
432 Commits
Author SHA1 Message Date
liumengyi bdfbebe15b * Fix bug #40444, modify the recycle path to the latest version. 2023-11-13 16:08:43 +08:00
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
朱金勇 e663e207bd * Fix english. 2023-08-16 04:15:20 +00:00
sunhao 375ba30b50 * zin: refactor programmenu with dropmenu component. 2023-07-06 22:27:55 +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
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
hufangzhou d1ef10c951 * Completion of language items. 2023-04-21 10:46:06 +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 d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +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
陈涛 6f054c614c * zin: fix product list page. 2023-04-10 17:18:15 +08:00
陈涛 46de6075e1 * zin: render product list page data. 2023-03-29 13:49:04 +08:00
陈涛 9aeb284f15 * zin: implements list page of product requirements. 2023-03-17 15:47:24 +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
wangyidong a946e5edeb Merge branch 'easycorp/zentaopms-sprint/hufangzhou_task_87019' 2023-03-15 09:44:59 +08:00
caoyanyi 3a06344d55 * Modify program language. 2023-03-14 15:03:50 +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
wangyidong a38a99e7b7 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 08:49:36 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong 68f64e96b2 * code for task #82363. 2023-01-12 14:12:31 +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