Commit Graph

2524 Commits

Author SHA1 Message Date
tianshujie
4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie
7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春
d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
liuyongkai
7567b5b499 * Fix bug #28056. 2022-09-27 08:16:01 +00:00
tianshujie
074120b27c * Fix bug #27976. 2022-09-27 09:04:39 +08:00
liuhong
55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
tianshujie
92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +08:00
tianshujie
0e0d13b0a0 * Finish task #70015. 2022-09-26 10:52:36 +08:00
王怡栋
7cbc6a53f0 Merge branch 'sprint/241_dyl_70025' into 'master'
Sprint/241 dyl 70025

See merge request easycorp/zentaopms!5531
2022-09-23 09:19:03 +00:00
dingyongliang
4ef4195d34 * center c-confirmed. 2022-09-23 08:30:24 +00:00
wangzemei
92a61c069f * fix style 2022-09-23 16:07:17 +08:00
王怡栋
c77ee31e31 Merge branch 'sprint/hufangzhou_feedback_863' into 'master'
* Handle feedback #863.

See merge request easycorp/zentaopms!5438
2022-09-23 01:23:43 +00:00
hufangzhou
0fdb6ddcf8 * Format the code. 2022-09-23 09:21:30 +08:00
dingyongliang
5525ee47a4 * set confirmed field center. 2022-09-22 07:03:57 +00:00
hufangzhou
2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
tianshujie
23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
hufangzhou
0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
王怡栋
0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
dingyongliang
5ceb75a7c2 * tash #68929, center the kanban title. 2022-09-14 06:04:57 +00:00
tianshujie
ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
liuhong
b3812880ae *Fix bug #27183. 2022-09-13 05:22:04 +00:00
xieqiyu
4d439f7337 * Fix bug#26180. 2022-09-09 14:33:29 +08:00
王怡栋
ceeda8a41e Merge branch 'master_xieqiyu_67693' into 'master'
* Add delay label.

See merge request easycorp/zentaopms!5277
2022-09-07 02:34:47 +00:00
xieqiyu
bb38728a54 * Add delay label. 2022-09-06 16:01:45 +08:00
xieqiyu
4f9128b9c1 * Fix bug#27288. 2022-09-06 15:51:03 +08:00
xieqiyu
36dc478de5 * Finish task#67693. 2022-09-06 10:21:24 +08:00
liumengyi
aaa08018f5 * Fix bug #23401. 2022-09-06 08:30:09 +08:00
liumengyi
4274a50e94 * Fix bug #27034. 2022-09-02 16:25:51 +08:00
王怡栋
e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
wangyidong
e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
tianshujie
f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
hufangzhou
a83076d330 * Fix bug #26457. 2022-09-01 09:47:13 +08:00
孙广明
0786961021 Merge branch 'sprint/max44_mayue_task#66993' into 'master'
Sprint/max44 mayue task#66993

See merge request easycorp/zentaopms!5202
2022-08-31 06:24:59 +00:00
mayue
b9efaee057 * Optimize code. 2022-08-31 13:39:59 +08:00
mayue
197e3d6ec4 * Fix error tips. 2022-08-31 13:16:22 +08:00
hufangzhou
61f6b1609f * Fix bug #26586. 2022-08-31 11:14:08 +08:00
mayue
451bccf572 * Optimize regex. 2022-08-30 17:09:15 +08:00
mayue
b03bdfa09e * Finish task #66993. 2022-08-30 16:11:54 +08:00
xieqiyu
ea98130180 * Fix bug#27010. 2022-08-29 15:35:01 +08:00
王怡栋
61999b0462 Merge branch 'master_xieqiyu_26991' into 'master'
* Fix bug#26991.

See merge request easycorp/zentaopms!5179
2022-08-29 05:38:16 +00:00
xieqiyu
95b7f73452 * Fix bug#26991. 2022-08-29 13:20:05 +08:00
wangyidong
8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
tianshujie
e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
孙广明
3fde178457 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5151
2022-08-26 07:12:18 +00:00
tianshujie
db4a18e3bd * Methods to optimize execution modules. 2022-08-26 15:10:31 +08:00
liumengyi
3da9fdd18c * Fix bug #26916. 2022-08-26 09:49:54 +08:00
tianshujie
db036c9172 * Fix bug #26879. 2022-08-25 15:31:31 +08:00
tianshujie
ad240eab61 * Fix bug #26889. 2022-08-25 15:28:47 +08:00
李玉春
9acdb61b77 Merge branch 'cyy_api' into 'master'
* Modify api param and app error.

See merge request easycorp/zentaopms!5107
2022-08-25 05:53:31 +00:00
caoyanyi
d764b13971 * Modify api param and app error. 2022-08-25 10:08:36 +08:00