Commit Graph

1217 Commits

Author SHA1 Message Date
Yagami
7097550950 * Fix bug #32069. 2023-02-13 13:50:12 +08:00
hufangzhou
8d26dceb4b * Compatible with php5.3. 2023-02-09 05:54:15 +00:00
liuhong
27a5843cad * Adjuct code for feedback #1836. 2023-02-03 06:09:53 +00:00
wangyidong
81820d5145 * fix bug #31887. 2023-02-02 16:00:42 +08:00
王怡栋
f98b046674 Merge branch 'master_bug_30814' into 'master'
* Fix bug #30814

See merge request easycorp/zentaopms!6833
2023-02-02 01:24:04 +00:00
liuhong
da4d42781d * Fix bug #30814 2023-02-01 02:09:36 +00:00
zhouxin
c5570bf560 * Fix bug for feedback #2015. 2023-02-01 09:18:27 +08:00
liuyongkai
d0db3a7e88 * Reslve feedback #1322. 2023-01-03 10:43:24 +08:00
tanghucheng
5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong
d28ea77f0d * code for task #80461. 2022-12-20 09:24:07 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
孙广明
52ba26c18c * Fix bug #30885. 2022-12-15 14:13:32 +08:00
孙广明
a72aba558a * Fix bug #30875. 2022-12-15 14:00:32 +08:00
孙广明
0beb81ebd7 * Fix multi task bug. 2022-12-13 16:15:28 +08:00
孙广明
81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
文睿 李
cb729e1864 * resolve conflict of task model, add method for task searching. 2022-12-08 03:44:50 +00:00
Wenrui LI
6491d70c06 * move task get list by search into task model, and add to api. 2022-12-07 09:43:50 +08:00
Wenrui LI
71f0eaad7f * move getListByConds of xuanbot to extension. 2022-12-02 10:36:28 +08:00
caoyanyi
f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
Wenrui LI
0d15699df3 * fix zentao bot. 2022-12-02 09:22:04 +08:00
Chenjianyu
364eb8da6e * add a task query method for zentao bot. 2022-12-02 08:14:40 +08:00
王怡栋
00312f6d4f Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358

See merge request easycorp/zentaopms!6431
2022-12-01 07:56:07 +00:00
chaideqing
3c3ce67354 * Refactor code. 2022-12-01 13:35:05 +08:00
chaideqing
6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing
bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
chaideqing
9fcb9099a7 * Fix feedback #1358. 2022-11-30 11:13:12 +08:00
caoyanyi
0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
Yagami
9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
caoyanyi
f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
mayue
c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
caoyanyi
1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi
90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liumengyi
0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
tianshujie
26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
mayue
2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
mayue
4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +08:00
李玉春
314f82091d Merge branch 'cyy_project' into 'master'
* Modify project icon.

See merge request easycorp/zentaopms!5960
2022-11-01 07:09:55 +00:00
caoyanyi
13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
hufangzhou
402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00:00
tanghucheng
376ce75e79 * Fix bug #29031,#29042,#29039. 2022-10-27 15:41:59 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie
354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
liyuchun
11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
zenggang
1e22332937 * Fix bug#28886 2022-10-25 01:02:04 +00:00
liyuchun
00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
tianshujie
cda753b5d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 08:54:08 +08:00
tianshujie
80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
tianshujie
8eda9a7f8c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-19 13:46:43 +08:00