Commit Graph

664 Commits

Author SHA1 Message Date
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
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
liyuchun
9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
hufangzhou
30d2fb6cfa * Fix bug #18014. 2021-12-28 10:19:20 +08:00
mayue
be1671c243 * Modify the code. 2021-12-23 14:34:44 +08:00
mayue
f8f763f9dd * Fix a bug #17638. 2021-12-23 14:15:27 +08:00
朱金勇
8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
朱金勇
efdadc07a7 Merge branch 'sprint/176_mayue_45544' into 'master'
* Finish a task #45544.

See merge request easycorp/zentaopms!928
2021-12-14 05:34:42 +00:00
Yurun
63bc23d43f Optimize bug module 2021-12-14 10:41:02 +08:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
songchenxuan
3f132af95b *Finish task #45539. 2021-12-07 14:51:23 +08:00
songchenxuan
dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
songchenxuan
05ea668852 *Finish task #45539. 2021-12-07 10:34:56 +08:00
tanghucheng
be4c1f3041 * Merge programplan into stage. 2021-12-03 14:31:47 +08:00
tianshujie
a5598ddf64 * Fix bug #16897. 2021-12-02 10:04:02 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春
adb7b76f3c Merge branch 'sprint/174_songchenxuan_45049' into 'master'
Sprint/174 songchenxuan 45049

See merge request easycorp/zentaopms!643
2021-11-30 03:19:07 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
tianshujie
7e225ce3f7 * Finish task #45081,45012. 2021-11-30 09:18:05 +08:00
songchenxuan
d19f60d9df * Finish task 45049. 2021-11-30 08:57:36 +08:00
李玉春
a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
孙广明
5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
tianshujie
96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
songchenxuan
45040819ae * Finish task 45049. 2021-11-29 14:00:06 +08:00
xieqiyu
763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
songchenxuan
35206b32a8 * Finish task #45049. 2021-11-26 14:00:01 +08:00
songchenxuan
ee53bd1ad2 * Finish task #45049. 2021-11-26 13:33:35 +08:00
tianshujie
774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
tianshujie
f342b1a219 * Modify search stories and bug issues. 2021-11-25 13:29:04 +08:00
tianshujie
3816d9a775 * Modify the scope of linked stories and bugs in the plan. 2021-11-25 13:16:20 +08:00