Commit Graph
598 Commits
Author SHA1 Message Date
tianshujie f49087bfba * Refactor getProjectStats method. 2023-08-17 10:03:22 +08:00
朱金勇 e636eaf108 - Remove array('' => '') for select. 2023-07-12 04:15:29 +00:00
tianshujie 5aae92cf04 * Change the smell code. 2023-07-10 18:48:31 +08:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
wangyidong feab25fc6b * Adjust for program dropmenu. 2023-07-08 16:15:20 +08:00
sunguangming 9cb8fa549c * Move view's function to model. 2023-07-08 11:22:53 +08:00
sunguangming fb634a3c62 * Fix program drop menu link. 2023-07-07 16:51:57 +08:00
sunguangming 09a8120f42 * Finish task #96485. 2023-07-05 16:21:27 +08:00
sunguangming b84f4f0dcf * Finish task #96498. 2023-07-04 14:22:08 +08:00
sunguangming a98d1e00f3 * Finish task #96499. 2023-07-04 13:54:15 +08:00
wangyidong 469b490039 * Adjust actions map for program browse page. 2023-06-20 14:05:05 +08:00
dingguodong a7ee228118 * Finish task#95328, put group icon into more. 2023-06-19 15:45:34 +08:00
wangyidong 87bb89fc0c * Adjust for program projectview page. 2023-06-16 15:53:31 +08:00
zhouxin 99c9733603 * Call setQuery in programModel. 2023-05-30 16:55:36 +08:00
zhouxin fd6339616d * Fix code smell for program module. 2023-05-30 16:50:53 +08:00
zhouxin 64368f82a0 * Batch replace "else if" sequence to "elseif". 2023-05-30 11:22:17 +08:00
chentao c5dd73abcc * product: fix sonar alerts. 2023-05-10 16:17:35 +08:00
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