Commit Graph
3427 Commits
Author SHA1 Message Date
wangyidong f7cdc29206 * Code for task #99798. 2023-08-11 09:39:13 +08:00
wangyidong 3a5f5372f2 * Fix error. 2023-08-09 11:17:24 +08:00
tanghucheng 82013ae764 * Fix task #99278, bug #36945. 2023-08-01 16:25:20 +08:00
songchenxuan 0e50a892fb * Fix bug #36954. 2023-07-31 18:21:10 +08:00
tanghucheng 6b0db86d24 Merge branch '18.x' into zentaoipd 2023-07-13 17:26:49 +08:00
songchenxuan 78cb5543f1 * Modify task start pause restart finish api. 2023-07-06 10:36:02 +08:00
songchenxuan 83277172c5 * Fix bug #36161. 2023-07-04 11:21:42 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
songchenxuan 4c7cb11170 * Reduce use hasPriv. 2023-06-28 13:48:13 +08:00
chaideqing 14d3b18d59 *Fix bug#35551. 2023-06-16 15:09:35 +08:00
孔令茂 2c0db453f0 * Fix eststarted and deadline save error of task. 2023-06-13 14:10:32 +08:00
chaideqing 3c0ac39132 * Fix bug#95108. 2023-06-13 14:05:46 +08:00
songchenxuan d1977bf8ba * Fix bug #35530. 2023-05-26 10:44:20 +08:00
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
hufangzhou 96cdadc40e * Fix bug #35342. 2023-05-19 09:59:41 +08:00
tanghucheng d1a26a2c70 * Fix bug #35306. 2023-05-18 04:12:58 +00:00
songchenxuan 49c301a472 * Fix bug #32710. 2023-05-17 17:08:31 +08:00
tanghucheng b24ce954fd * Code for task #92310. 2023-05-08 19:23:21 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
caoyanyi 24f75dd73b * Modify files get. 2023-04-25 10:49:10 +08:00
wangyidong 54d513129a * fix bug #34599. 2023-04-25 09:11:47 +08:00
hufangzhou 92175b0f48 * Fix bug #31818. 2023-04-21 16:51:39 +08:00
liumengyi c6adbbc62b * Fix bug #32414. 2023-04-20 15:53:53 +08:00
liumengyi 01ffcbef5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-20 15:22:32 +08:00
wangyidong a8f88d0178 * fix bug #33393. 2023-04-20 14:39:46 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
朱金勇 51a43d37d6 * Fix date display in task module. 2023-04-19 04:34:10 +00:00
liumengyi 168ebe2b56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 09:08:44 +08:00
朱金勇 b310d35aac * Fix bug#34345. 2023-04-19 00:57:05 +00:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
朱金勇 c9637a0418 * Fix bug#34305. 2023-04-18 04:22:09 +00:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
朱金勇 3385f5d6e4 * Fix multiple task. 2023-04-17 08:18:39 +00:00
liumengyi b4baf69899 * Finish task #91355. 2023-04-17 09:28:08 +08:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 e074e17dc8 * Fix bugs of dmdb. 2023-04-16 11:53:19 +00:00
wangyidong aac5f7c4d2 * fix bug for maxcount config. 2023-03-23 14:49:40 +08:00
liumengyi fbf1a7a0bb * Fix bug #33093. 2023-03-20 07:26:56 +00:00
guofeilong d2f0e788fa * Code for bug #33060 . 2023-03-17 11:08:31 +08:00
管西迎 497ac481b8 Merge branch 'bugfix/32939_lmy' into 'master'
* Fix bug #32939.

See merge request easycorp/zentaopms!7216
2023-03-16 08:40:00 +00:00
liumengyi c18770de91 * Fix bug #32939. 2023-03-16 08:28:27 +00:00
liumengyi 5b3bef53c9 * Fix bug #33018. 2023-03-16 07:35:29 +00:00
孙广明 41538eb1db Merge branch 'feature/38477' into 'master'
* Fix bug of task #87014.

See merge request easycorp/zentaopms!7190
2023-03-15 05:38:41 +00:00
liumengyi 196f9035e9 * Modify language item. 2023-03-15 00:36:12 +00:00
liumengyi 5b546fd987 * Fix bug of task #87014. 2023-03-15 00:28:45 +00:00
liumengyi eeb106132c * Fix bug of task #87014. 2023-03-15 00:19:22 +00:00
liumengyi 6a5966d8ca * Fix bug of task #87013. 2023-03-14 09:20:55 +00:00
孙广明 d235b8e924 Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.

See merge request easycorp/zentaopms!7184
2023-03-14 09:15:08 +00:00
liumengyi 1d16c63d87 * Fix bug of task #87013. 2023-03-14 08:57:00 +00:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00