Commit Graph
276 Commits
Author SHA1 Message Date
liumengyi efcb3edc61 - Remove language items of productView and projectView these have been defiend in common module. 2023-11-08 13:56:40 +08:00
朱金勇 bde6af1d93 * Migrate changes of 18.x to master. 2023-10-12 01:16:07 +00:00
wangyidong 1619a3f7e3 * Code for task #99424. 2023-08-21 15:15:24 +08:00
dingguodong 15b228263b * Fix typo and reindent. 2023-08-21 14:01:15 +08:00
wangyidong b3a1d048c0 * Remove useless for program projectView page. 2023-07-25 10:57:37 +08:00
sunguangming 25840602af * Finish task #96497. 2023-07-04 18:26:29 +08:00
wangyidong 469b490039 * Adjust actions map for program browse page. 2023-06-20 14:05:05 +08:00
chentao 61ba3a732e * Change search fields of the search form within program module. 2023-06-20 10:48:08 +08:00
chentao be0f2a98be * Show search form on product view page. 2023-06-19 18:36:52 +08:00
chentao 0171d1e180 * Add translation of checked summary for the data table on product view page. 2023-06-16 19:54:11 +08:00
chentao 41b449e997 * Implement group of operation buttons to the toolbar of product view page. 2023-06-16 16:56:55 +08:00
dingguodong 7b152c9231 * Rename to distinguish long names from abbreviations. 2023-06-16 15:21:45 +08:00
chentao 035cb8d2c7 * Add and synchronize the translations for the program module. 2023-06-15 09:45:13 +08:00
chentao 42a38b246a * Synchronizes the translations of program module. 2023-06-14 10:05:39 +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
陈涛 fcc2b973ad * zin: add translation to program module 2023-04-10 13:36:01 +08:00
陈涛 0ea72fa651 * zin: render product view page. 2023-03-27 22:26:06 +08:00
陈涛 aca8ee19f3 + zin: implements product view page. 2023-03-23 17:31:47 +08:00
tianshujie f9fdc67892 * Modify language items for project,product common. 2023-03-08 09:51:30 +08:00
caoyanyi 9ffce9d8a7 * Modify project lang to variable. 2023-03-06 10:19:48 +08:00
wangyidong cdbbf26ff3 * code for task #84544. 2023-02-21 10:06:39 +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
tianshujie 1a097d73eb * Finish task #75690. 2022-11-14 10:37:21 +08:00
tianshujie 2e2127c53a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-10 13:30:26 +08:00
wangyidong 9f18188062 * fix bug #29062. 2022-10-28 13:13:01 +08:00
wangyidong 1a9aca53c0 * code for task #73471. 2022-10-25 11:30:40 +08:00
tianshujie 058e4ecf73 * Finish task #73291. 2022-10-24 16:00:11 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
lanzongjun 49faebaad7 * task #69250#69251 2022-09-16 14:58:39 +08:00
liumengyi 2bb576415a * Fix bug #26298. 2022-09-05 11:22:12 +08:00
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
周旭东 b2026b22af Update de.php 2022-08-19 00:47:54 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
zhouxudong 837a32960f * Fix bug #26294. 2022-08-11 01:46:07 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong c68f271328 * Finish task 62581. 2022-08-07 13:55:38 +00:00
zhouxudong 0091ac82c6 * Update. 2022-08-05 08:16:11 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 584793163f * Finish task #62852. 2022-08-03 07:31:07 +00:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong 535922b47c * Finish task #62852. 2022-08-02 09:36:54 +00:00
zhouxudong 8486aba922 * Finish task #62852. 2022-08-02 05:51:49 +00:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
王怡栋 e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
2022-06-30 01:28:55 +00:00
zhouxudong 298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong 461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
liumengyi 3dda133a92 * Finish task #58561. 2022-06-28 11:08:30 +08:00