Commit Graph
43873 Commits
Author SHA1 Message Date
zhouxudong 41862bf81c * Batch edit append ignore. 2022-08-22 02:20:05 +00:00
zhouxudong faf66f2d63 * Optimization task #64888. 2022-08-19 07:51:38 +00:00
王怡栋 e75b9b4b5f Merge branch 'sprint/228_tianshujie_api' into 'master'
* Get the execution list.

See merge request easycorp/zentaopms!5029
2022-08-19 05:13:29 +00:00
王怡栋 0c1750f575 Merge branch 'sprint/hufangzhou_action' into 'master'
* Add the ignored object type config for plugin.

See merge request easycorp/zentaopms!5028
2022-08-19 05:12:45 +00:00
王怡栋 035494261b Merge branch 'max42_tanghucheng' into 'master'
* Fix bug #26677.

See merge request easycorp/zentaopms!5027
2022-08-19 05:12:14 +00:00
王怡栋 861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
王怡栋 5e76c2db87 Merge branch 'sprint/228_26664' into 'master'
Fix bug#26664

See merge request easycorp/zentaopms!5021
2022-08-19 05:10:19 +00:00
曾刚 caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00
wangyidong 99eafb5d59 * fix bug for install extension. 2022-08-19 12:17:25 +08:00
tianshujie b47cd1b77b * Fixed an issue where the admin could not click on the program. 2022-08-19 11:36:05 +08:00
tianshujie e667ba15db * Get the execution list. 2022-08-19 11:33:10 +08:00
tanghucheng 858f0c98ef * Code for bug #26677. 2022-08-19 11:26:24 +08:00
hufangzhou 9a5c9299b3 * Add the ignored object type config for plugin. 2022-08-19 11:16:04 +08:00
tanghucheng 8898465485 * Fix bug #26677. 2022-08-19 11:11:29 +08:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
王怡栋 aad7d0638f Merge branch 'fixbug' into 'master'
* Fix bug #26673.

See merge request easycorp/zentaopms!5025
2022-08-19 03:02:44 +00:00
王怡栋 fcaa812a59 Update dao.class.php 2022-08-19 03:02:13 +00:00
tanghucheng 62226afa38 * Fix bug #26673. 2022-08-19 10:57:18 +08:00
wangyidong 4c15f7fa5b Merge branch 'sprint/zentaomax42' 2022-08-19 10:35:42 +08:00
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
zhouxudong 9dbfa8b99b * FInish task #64882. 2022-08-19 02:22:42 +00:00
zhouxudong 0a3c297b43 * Finish task #64882. 2022-08-19 02:18:16 +00:00
zhouxudong 3435040a3f * Finish task #64882. 2022-08-19 01:55:48 +00:00
王怡栋 ce335348a8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23932

See merge request easycorp/zentaopms!5020
2022-08-19 01:31:23 +00:00
王怡栋 b5e7d1e0dc Merge branch 'sprint/max42_mayue_fixbug' into 'master'
* Fix workflow issue.

See merge request easycorp/zentaopms!5019
2022-08-19 01:30:50 +00:00
lanzongjun 039d4a4e19 * fix bug #23932 2022-08-19 09:23:18 +08:00
mayue a3e8222009 * Fix workflow issue. 2022-08-19 08:52:37 +08:00
王怡栋 5d28a2973f Merge branch 'sprint/229' into 'master'
Sprint/229

See merge request easycorp/zentaopms!5018
2022-08-19 00:50:35 +00:00
周旭东 b2026b22af Update de.php 2022-08-19 00:47:54 +00:00
李玉春 6399c58056 Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976

See merge request easycorp/zentaopms!5017
2022-08-18 09:57:34 +00:00
tianshujie 1eccd830ec * Finish task #64976. 2022-08-18 17:24:06 +08:00
zhouxudong 9883b69c7d * Finish task #64882. 2022-08-18 09:21:35 +00:00
tianshujie dc45d79849 * Finish task #64976. 2022-08-18 17:09:35 +08:00
tianshujie db82296c3c * Finish task #64976. 2022-08-18 17:07:30 +08:00
tianshujie 36d0243dac * Add pager to the zero case story list. 2022-08-18 16:59:56 +08:00
tianshujie 2851fd4c2c * Resolve issue #720. 2022-08-18 16:24:43 +08:00
王怡栋 93b0c0efee Merge branch 'sprint/228_tianshujie_63687' into 'master'
* Finish task #63687.

See merge request easycorp/zentaopms!5016
2022-08-18 08:14:01 +00:00
tianshujie 88eb976835 * Finish task #63687. 2022-08-18 16:12:16 +08:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
王怡栋 29443f8d2a Merge branch 'sprint/228_zg_tasks' into 'sprint/228'
Sprint/228 zg tasks and units

See merge request easycorp/zentaopms!4999
2022-08-18 07:15:15 +00:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
tianshujie 9f468e6d24 * Finish task #64976. 2022-08-18 14:35:19 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
王怡栋 f3d49ef75f Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939

See merge request easycorp/zentaopms!5010
2022-08-18 05:54:12 +00:00
李玉春 ae0ee026cc Merge branch 'zenops_41' into 'master'
Zenops 41

See merge request easycorp/zentaopms!5013
2022-08-18 05:21:42 +00:00
liyuchun 9da91f6d91 * Add update sql. 2022-08-18 13:21:12 +08:00
liyuchun bbe6ce4983 Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41 2022-08-18 13:20:35 +08:00
liyuchun 2ccdc2c118 * Edit db file name. 2022-08-18 13:20:10 +08:00