Commit Graph

792 Commits

Author SHA1 Message Date
zhujinyong
a91d090845 + Add options api. 2022-03-30 17:08:03 +08:00
朱金勇
fe3cbd34d1 Merge branch 'app_zhengrunyu' into 'master'
* Add api for close bug and confirm bug.

See merge request easycorp/zentaopms!2599
2022-03-29 01:48:20 +00:00
zhengrunyu
4c5be242cd * Add api for close bug and confirm bug. 2022-03-29 09:41:17 +08:00
李玉春
c6e89fc7c1 Merge branch 'fixbug_cyy' into 'master'
* Fix bug #20156.

See merge request easycorp/zentaopms!2570
2022-03-28 03:16:18 +00:00
caoyanyi
99ad50eb3e * Fix bug #20156. 2022-03-28 10:53:03 +08:00
xieqiyu
39123bd4d9 * Fix bug#20878. 2022-03-25 14:15:30 +08:00
孙广明
a2a191b421 Merge branch 'liyuchun_bug_17235' 2022-03-22 15:45:41 +08:00
孙广明
41eee3ddd4 Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
#   module/common/model.php
2022-03-22 07:43:58 +00:00
zenggang
784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
liyuchun
166cda1186 * Fix bug #17235. 2022-03-22 14:12:44 +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
xieqiyu
0d21516997 * Modify create bug. 2022-03-22 08:40:43 +08:00
liyuchun
0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
zenggang
ed17f3b7bb * Finish task#51105,51102 2022-03-18 05:17:53 +00:00
zhouxin
f6a7577749 Fix bug #18306. 2022-03-16 01:39:05 +00:00
王怡栋
9ffa55da56 * fix bug #20682. 2022-03-15 14:31:01 +08:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
mayue
9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu
58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
tianshujie
234a2352ec * Fix bug #20487. 2022-03-09 10:37:10 +08:00
zhangzilong
d04161c0cc * Code for task #49888. 2022-03-09 10:08:46 +08:00
xieqiyu
25ad53744a * Add selected lane when batch create bug in kanban. 2022-03-08 10:44:38 +08:00
孙华伟
03e3f26ad5 * 2022-03-08 10:03:06 +08:00
tanghucheng
15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
zhangzilong
45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
孙华伟
d8bb8a903e * 2022-03-04 14:34:01 +08:00
孙广明
b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
zhangzilong
92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
zhangzilong
ccc4ce9298 * Code for bug #49297. 2022-03-02 10:10:47 +08:00
xieqiyu
996992936e * Change branches for batch create bug in execution. 2022-03-02 10:00:08 +08:00
孙广明
6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
zhangzilong
3b5ebbda16 * Finish task #49297. 2022-03-01 14:57:23 +08:00
xieqiyu
5cd1872e93 * Modify edit bug and batch edit bug. 2022-02-28 17:04:12 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
xieqiyu
9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
xieqiyu
da00225feb * Fix bug. 2022-02-22 11:11:43 +08:00
xieqiyu
8cac8975bb * Adjust code. 2022-02-22 11:09:16 +08:00
xieqiyu
c053468aa6 * Fix bug. 2022-02-22 11:05:45 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
王怡栋
3ebcfb1ddc * fix bug #19693. 2022-02-17 11:06:28 +08:00
tianshujie
e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
李玉春
679e06a7d0 Merge branch 'devops21_zhangzilong_19255' into 'master'
* Code for bug #19255.

See merge request easycorp/zentaopms!1791
2022-02-14 08:52:02 +00:00
zhangzilong
921e887dbe * Code for bug #19255. 2022-02-14 16:30:03 +08:00
liyuchun
5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
李玉春
c856323c92 Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1773
2022-02-14 00:26:45 +00:00
周旭东
84b35d270b Update control.php 2022-02-14 00:26:15 +00: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
李玉春
1e9277e1eb Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1768
2022-02-11 08:20:22 +00:00