Commit Graph
43833 Commits
Author SHA1 Message Date
lanzongjun 039d4a4e19 * fix bug #23932 2022-08-19 09:23:18 +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
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
王怡栋 c586a24d50 Merge branch 'sprint/228_liumengyi_65551' into 'sprint/228'
* Finish task #65551.

See merge request easycorp/zentaopms!5014
2022-08-18 05:05:08 +00:00
王怡栋 308fb3d2ee Merge branch 'sprint/228_liumengyi_25319' into 'master'
* Fix bug #25319.

See merge request easycorp/zentaopms!4991
2022-08-18 05:02:22 +00:00
liumengyi 62d465d047 * Finish task #65551. 2022-08-18 11:22:16 +08:00
朱金勇 3cf6c73263 Merge branch 'sprint/remove-composer' into 'master'
- Remove composer.json.

See merge request easycorp/zentaopms!5009
2022-08-18 03:16:25 +00:00
李玉春 f10263f0c0 Merge branch 'sprint/master_zhouxudong_64886' into 'sprint/229'
Sprint/master zhouxudong 64886

See merge request easycorp/zentaopms!4990
2022-08-18 03:08:24 +00:00
王怡栋 1f9b619a4e Merge branch 'sprint/ZUI_guofeilong_add_icon_subreview_user' into 'master'
* Add zentaoIcon sub-review-user

See merge request easycorp/zentaopms!5012
2022-08-18 02:53:58 +00:00
tianshujie 8287baa6dc * Finish task #63696. 2022-08-18 10:45:58 +08:00
tianshujie 46071ffaec * Finish task #63696. 2022-08-18 10:42:06 +08:00
caoyanyi 7b71377d3c Merge branch 'master' into zenops_41 2022-08-18 10:37:47 +08:00
guofeilong 04178d6624 * Add zentaoIcon sub-review-user 2022-08-18 02:27:42 +00:00
tianshujie 9cd4212ef7 i* Finish task #63696. 2022-08-18 10:23:41 +08:00
tianshujie 0ea6aa7b27 * Finish task #63696. 2022-08-18 10:04:09 +08:00
mayue a48a15cdb1 * Ajust codes about stage setType. 2022-08-18 09:31:29 +08:00
Lufei 34ac7b70e5 - Remove composer.json.
zentaopms is not published in packagist and the dependencies in the file are outdated
2022-08-18 09:16:53 +08:00
sunguangming ef679444bd * Code for file checkpriv bug. zentaopms_17.5 2022-08-18 08:47:49 +08:00
mayue b3801a92a6 * Optimize code. 2022-08-18 08:47:31 +08:00
sunguangming b175607c41 * Code for file checkpriv bug. 2022-08-18 08:25:37 +08:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
mayue e95ecf9244 * Finish task #64939. 2022-08-17 16:20:17 +08:00
caoyanyi 8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +08:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
zhouxudong 41e6242736 * Finish task #64886. 2022-08-17 07:31:42 +00:00
王怡栋 dd1761b300 Merge branch 'sprint/229_zhouxudong_64884' into 'sprint/229'
* Finish task #64884.

See merge request easycorp/zentaopms!4992
2022-08-17 07:29:08 +00:00
王怡栋 f9d39ac46b Merge branch 'sprint/229_zhouxudong_64877' into 'sprint/229'
* Finish task #64877.

See merge request easycorp/zentaopms!4988
2022-08-17 07:24:59 +00:00
王怡栋 74b66c9bb3 Merge branch 'master_xieqiyu_26414' into 'master'
* Fix bug#26414.

See merge request easycorp/zentaopms!4994
2022-08-17 07:22:40 +00:00
zhouxudong d557c4eed6 * Finish task #64886. 2022-08-17 07:22:26 +00:00
xieqiyu 6f6491148a * Fix bug#26414. 2022-08-17 15:19:53 +08:00
周旭东 a3ebcf33d5 Update control.php 2022-08-17 07:18:11 +00:00
zhouxudong 39007e35b2 Merge branch 'sprint/229_zhouxudong_64888' into sprint/229 2022-08-17 07:15:55 +00:00