Commit Graph
581 Commits
Author SHA1 Message Date
wangyidong aa4bc30df9 * add unit test. 2023-05-05 18:44:28 +08:00
wangyidong cec6929831 * code for sonar. 2023-05-05 15:53:51 +08:00
wangyidong b559be298d * adjust code for getProjectStatsByProduct method in productModel. 2023-05-05 15:47:36 +08:00
wangyidong 99297423b7 * fix bug #34898. 2023-04-27 16:20:41 +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
caoyanyi 9d9378e1dc * Modify db field. 2023-04-17 14:20:20 +08:00
caoyanyi b57c935be4 * Revert code. 2023-04-17 14:00:40 +08:00
caoyanyi c843469210 * Modify sql error. 2023-04-17 13:57:55 +08:00
朱金勇 58f458f6d0 * Fix bugs of program action. 2023-04-11 05:28:42 +00:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
Yagami 3f307b913d * Fix bug #33154. 2023-03-21 14:02:36 +08:00
hufangzhou 14f289ff97 * Finish task #87019. 2023-03-13 09:44:13 +00:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
wangyidong 516d773d1d * fix bug #31718. 2023-01-30 09:01:15 +08:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
xieqiyu 5a2b75d24f * Finish task#81780. 2023-01-03 10:59:35 +08:00
wangyidong 58efe7b011 * code task #80458,80463. 2022-12-20 11:31:15 +08:00
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
xieqiyu 4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +08:00
孙广明 f689432ec8 Merge branch 'sprint/zentaopms262_mayue_bug#29958' into 'master'
* Fix bug #29958.

See merge request easycorp/zentaopms!6275
2022-11-22 02:19:26 +00:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
Yagami ae9764ebd1 * Finish task #77013. 2022-11-22 09:30:28 +08:00
tianshujie 31246ae5e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-17 15:41:26 +08:00
xieqiyu 679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
xieqiyu 2a7493ac78 * Fix bug#29896. 2022-11-16 15:48:18 +08:00
tianshujie 08e8bfea06 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-15 17:07:27 +08:00
daitingting 8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
tianshujie 1a097d73eb * Finish task #75690. 2022-11-14 10:37:21 +08:00
tianshujie 718817d9fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 14:48:03 +08:00
tianshujie eaa13a4fbf * Add an delay icon to the program list. 2022-11-11 13:22:41 +08:00
tianshujie 0544c75976 * Modify the project list name display question. 2022-11-11 09:20:55 +08:00
tianshujie 84d69fca51 * Finish task #73291. 2022-11-11 08:45:30 +08:00
tianshujie b544c67d26 * Add a jump link for the name. 2022-11-10 14:49:44 +08:00
tianshujie 2e2127c53a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-10 13:30:26 +08:00
tianshujie 70239d4330 * Action button to add data table. 2022-11-10 13:24:46 +08:00
tianshujie f37ca78f61 * Add actions of program list. 2022-11-10 10:07:26 +08:00
tianshujie 51a786f73d * Finish task #73291. 2022-11-08 14:33:53 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting 8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting 219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
tianshujie d15ed1e77d * Modify the progress field of the program. 2022-11-01 08:37:15 +08:00
daitingting dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
wangyidong d1f11b72d8 * fix bug #29065. 2022-10-28 14:08:53 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong ce74f027b4 * adjust for show all projects. 2022-10-27 08:27:52 +08:00
daitingting fd288a6a3c * Finish task #71566,#71567,#72987. 2022-10-25 08:20:29 +00:00
wangyidong 585b12838e * code for task #73472. 2022-10-25 14:04:12 +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