Commit Graph

694 Commits

Author SHA1 Message Date
wangyidong
0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
朱金勇
e63ab95fe5 Merge branch 'sprint/renying_bug17274' into 'master'
Fix bug#17274

See merge request easycorp/zentaopms!2941
2022-04-14 06:45:01 +00:00
renying
d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
wangxiaomeng
b085ec1029 Aborting commit due to empty commit message 2022-04-14 13:56:03 +08:00
wangxiaomeng
dee641a3b6 Aborting commit due to empty commit message 2022-04-14 13:21:41 +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
zhouxudong
dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
tanghucheng
0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +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
zhouxudong
d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
xieqiyu
09fa1197f6 * Fix bug#20278. 2022-04-06 16:59:00 +08:00
xieqiyu
39123bd4d9 * Fix bug#20878. 2022-03-25 14:15:30 +08:00
zenggang
1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
tianshujie
129c55db39 * Delete useless judgment conditions. 2022-03-22 13:40:43 +08:00
tianshujie
1004f727ae * Modify language item. 2022-03-22 12:35:34 +08:00
tianshujie
8cf4b3bcae * Fix bug #19261. 2022-03-22 11:01:14 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙广明
73e6d617ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.

See merge request easycorp/zentaopms!2383
2022-03-21 00:29:00 +00:00
zhujinyong
9fcb03b0fd + Add api of tetsuite. 2022-03-21 08:25:20 +08:00
liumengyi
dfb6c1361e * Modify code. 2022-03-21 08:12:51 +08:00
liumengyi
bb361baa6e * Add function annotation. 2022-03-17 17:12:08 +08:00
孙华伟
5ee928527a *Fix bug#20455 2022-03-14 10:30:55 +08:00
xieqiyu
4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
xieqiyu
139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong
d04161c0cc * Code for task #49888. 2022-03-09 10:08:46 +08:00
xieqiyu
944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
xieqiyu
25ad53744a * Add selected lane when batch create bug in kanban. 2022-03-08 10:44:38 +08:00
zhangzilong
45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
王怡栋
3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
zhouxudong
c8bfc2716b *Fix bug #48844. 2022-02-14 16:42:58 +08:00
liyuchun
5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
zhouxudong
c3112657d2 *Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844. 2022-02-11 17:33:22 +08:00
zhouxudong
0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhouxudong
8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
liyuchun
e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zhouxudong
818bb2ef63 *Finish task #48844. 2022-02-10 14:04:19 +08:00
liumengyi
d0b9a47318 * Fix bug #18970. 2022-01-26 09:02:54 +08:00
tianshujie
97a4fb7cc9 * Adjust code of kanban and bug model. 2022-01-17 17:24:42 +08:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
liumengyi
42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
songchenxuan
bc637ef419 *Fix bug 18183,18184. 2022-01-05 15:11:26 +08:00
songchenxuan
ecc3ae4608 *Fix bug 18183,18184. 2022-01-05 15:06:56 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
songchenxuan
5e7c715efb *Finish task #46519. 2021-12-29 17:42:41 +08:00