Commit Graph
406 Commits
Author SHA1 Message Date
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +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
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
sunguangming a6150fa372 * Fix bug #28410. 2022-10-11 13:35:04 +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
李玉春 c53809e799 Merge branch 'sprint/241_tianshujie_68934' into 'master'
* Finish task #68934.

See merge request easycorp/zentaopms!5449
2022-09-21 05:13:34 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +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
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
tianshujie 2851fd4c2c * Resolve issue #720. 2022-08-18 16:24:43 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
xieqiyu a7d8ff275d * Modify lang. 2022-08-18 09:38:44 +08:00
xieqiyu 6c1dba2561 * Add product and story lang. 2022-08-18 00:08:40 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
sunjun c0a04777e5 fixbug_lang 2022-06-30 01:55:33 +00:00
sunjun db7d9edd07 fixbug_lang 2022-06-30 01:41:25 +00:00