Commit Graph
162 Commits
Author SHA1 Message Date
sunguangming 25840602af * Finish task #96497. 2023-07-04 18:26:29 +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
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
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
tianshujie 058e4ecf73 * Finish task #73291. 2022-10-24 16:00:11 +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
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
王怡栋 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
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +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
liumengyi 3dda133a92 * Finish task #58561. 2022-06-28 11:08:30 +08:00
王怡栋 2a82c6a6a1 Merge branch 'sprint/master_zhouxudong_58576' into 'master'
Sprint/master zhouxudong 58576

See merge request easycorp/zentaopms!4163
2022-06-28 01:05:10 +00:00
zhouxudong 72200617d3 * Finish task #58576. 2022-06-28 00:57:01 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
zhouxudong 69b87ae29f * Fix bug #24368. 2022-06-27 03:20:49 +00:00
zhouxudong 463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
zhouxudong f6c4b3adb1 * Finish task #56908. 2022-06-13 07:59:29 +00:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
zhouxudong 5b33b75d41 * Finish task #54476 #54475 #54474. 2022-05-18 10:18:02 +00:00
wangyidong 759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08:00
孙广明 10a542cc35 Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs

See merge request easycorp/zentaopms!3374
2022-05-13 01:57:36 +00:00
zenggang e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
zenggang b5093f3a1b * Code for task#53657 2022-05-11 08:32:50 +00:00
zenggang d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00:00
songchenxuan b4a5b7bff2 *Translate. 2022-02-24 16:52:16 +08:00
songchenxuan 66bbe4cfbe *Translate. 2022-02-24 16:31:58 +08:00
zhengrunyu b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
reneeteng cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00