Commit Graph

344 Commits

Author SHA1 Message Date
王怡栋
d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2
fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting
e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting
96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
mayue
181d0d67de * Fix bug #21948. 2022-04-24 09:58:10 +08:00
mayue
2ed8646488 * Fix bug #21948. 2022-04-24 09:31:14 +08:00
hufangzhou
2dc575a760 * Fix bug #11074. 2022-04-21 14:53:38 +08:00
王怡栋
a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
周旭东
4e7fcd1ad1 Update model.php 2022-04-13 03:08:48 +00:00
zhouxudong
37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
zhouxudong
19f499e121 * Fix bug #17994. 2022-04-13 10:36:39 +08:00
zhouxudong
1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong
233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong
8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
tianshujie
a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
tianshujie
f1c24db544 * Fix bug #16350. 2022-04-11 14:16:45 +08:00
zhouxudong
d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
xieqiyu
d8ef00183b * Fix bug#17296. 2022-04-06 13:47:49 +08:00
王怡栋
38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhangzilong
3a545530a6 * Code for bug #19319. 2022-02-14 11:28:01 +08:00
zhangzilong
1195ff854b * Fix bug #19319. 2022-02-14 11:20:41 +08:00
zhangzilong
127c3ff36a * Code for bug #19319. 2022-02-14 11:16:23 +08:00
zhangzilong
bb828d54cf * Code for bug #19319. 2022-02-14 11:13:24 +08:00
zhangzilong
106447b401 * Fix bug #19319. 2022-02-14 10:56:50 +08:00
zhangzilong
dcdfb0cdee * Fix bug #19319. 2022-02-14 10:32:12 +08:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
孙广明
3ab13aa61e Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.

See merge request easycorp/zentaopms!1322
2022-01-11 00:36:32 +00:00
songchenxuan
bb13431274 *Fix bug 18074. 2022-01-11 08:34:55 +08:00
liumengyi
cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
songchenxuan
3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
xieqiyu
4de8fc462f * Fix bug#17079. 2021-12-06 09:33:41 +08:00
mayue
8ba4ebf390 * Conflict resolution #17036. 2021-12-02 15:40:02 +08:00
mayue
f6676e2757 * Conflict resolution #17036. 2021-12-02 15:36:31 +08:00
mayue
8c355ac388 * Modify style #17036. 2021-12-02 15:30:23 +08:00
songchenxuan
98b5a77754 * Fix bug #16798. 2021-12-01 14:16:24 +08:00
tianshujie
7498352698 * Fix bug #16789. 2021-12-01 13:13:21 +08:00
tianshujie
2a469dc6f7 * Modify use case branch query conditions. 2021-11-30 11:17:10 +08:00
tianshujie
d2f57affa6 * Finish task #45000. 2021-11-30 10:30:36 +08:00
hufangzhou
8e9f8b860e * Fix bug #16092. 2021-11-11 11:07:23 +08:00
zenggang
f495f058ed * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 2021-09-08 15:31:11 +08:00
zenggang
dfbe7ad645 * Fix bug#14557 2021-09-03 10:56:04 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie98
f8074fdafb * Finish task #41800. 2021-08-25 10:45:33 +08:00
tianshujie98
751900edf9 * Finish task #41215. 2021-08-10 11:31:15 +08:00
qiyu-xie
2c27035699 * Adjust code. 2021-07-16 11:22:56 +08:00
wangyidong
503815289a * finish task #40114. 2021-07-13 13:29:50 +08:00