Commit Graph
2966 Commits
Author SHA1 Message Date
hufangzhou d29643cf57 * Revert the code. 2023-03-21 13:25:02 +08:00
hufangzhou 5bc154a69b * Fix bug #33088. 2023-03-20 15:39:28 +08:00
wangyuting2 4bf396b34c * Fix bug #33023. 2023-03-20 13:59:10 +08:00
wangyidong db49612b75 * fix bug #33059. 2023-03-17 13:06:38 +08:00
caoyanyi 1bc1e3fc0f * Adjust code. 2023-03-16 15:53:11 +08:00
caoyanyi a99ed812d3 * Code for bug #33010. 2023-03-16 15:37:12 +08:00
王怡栋 f526a16291 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/custom/lang/zh-cn.php
2023-03-15 06:19:32 +00:00
hufangzhou 047dfd6e54 * Fix bug #32940. 2023-03-15 14:09:10 +08:00
管西迎 d0817bc8a0 Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.

See merge request easycorp/zentaopms!7193
2023-03-15 03:10:17 +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
管西迎 93ca7dda5f Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.

See merge request easycorp/zentaopms!7192
2023-03-15 02:55:12 +00: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
tianshujie 3756e90cfd * Fix bug 32929. 2023-03-15 10:41:40 +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 665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
caoyanyi b6f0e594c6 * Fix bug #31434. 2023-03-09 13:12:25 +08:00
tianshujie 13ce2eac8d * Fix bug #31975. 2023-03-09 10:32:05 +08:00
caoyanyi 1364c7923b * Fix bug #28114. 2023-03-08 16:41:51 +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
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie 4d400723ce * Modify more select display method. 2023-03-03 15:54:33 +08:00
liumengyi 7851944450 * Finish task #85640. 2023-03-03 03:19:04 +00:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
Yagami fda9efd09c * Remove request stages in bug batch-create page. 2023-03-02 16:05:35 +08:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
caoyanyi 6caaf4c316 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 08:32:25 +08:00
tianshujie af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
caoyanyi 7df9719cf3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-22 08:24:22 +08:00
zhujinyong 39b2773e77 * Fix bug #32332. 2023-02-21 15:55:33 +08:00
wangyidong 546cc63fb2 * code for task #84544. 2023-02-21 10:46:32 +08:00
caoyanyi 653c393eb1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 09:01:07 +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 5aee651454 * Code for finish task #84575. 2023-02-18 18:39:07 +08:00
wangyidong 2b75166e7c * fix bug #32030. 2023-02-17 14:12:04 +08:00
tianshujie be00a4a8ae * Code for finish task #84580. 2023-02-16 09:29:05 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
zhujinyong 5b4fe30491 * Filter stages. 2023-02-07 11:29:05 +08:00
zhujinyong 61d36f2fcb * Finish task #83939, #83935. 2023-02-07 10:32:13 +08:00
xieqiyu 3c8d8e27a6 * Code for bug#28704. 2023-02-03 14:34:16 +08:00
wangyidong b4598b8738 * fix bug #31725. 2023-01-29 17:18:40 +08:00