Commit Graph

817 Commits

Author SHA1 Message Date
孙广明
07dc4c4055 Merge branch 'api_zry' into 'master'
* Fix bug 22061.

See merge request easycorp/zentaopms!3234
2022-05-05 08:22:46 +00:00
zhengrunyu
e7699d04f1 * Fix bug 22061. 2022-05-05 16:19:48 +08:00
xieqiyu
88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
mayue
aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
zhengrunyu
18e2cdb71c * Add block. 2022-04-27 15:19:59 +08:00
zhengrunyu
6f18ae83c2 * Add model function to static. 2022-04-27 15:01:46 +08:00
孙广明
8a70ffb277 * Fix bug #10735. 2022-04-26 10:38:31 +08:00
tianshujie
42676bf558 * Adjust the scope of modules when searching for bugs. 2022-04-25 01:27:24 +00:00
孙广明
49bbc9c0a2 * Fix export bug. 2022-04-19 14:41:52 +08:00
tianshujie
5b1c7675de * Delete extra Spaces. 2022-04-19 11:03:08 +08:00
tianshujie
9fc3f34477 * Fix bug #21682. 2022-04-18 14:33:54 +08:00
tianshujie
ab1ad4051b * Fix bug #21682. 2022-04-18 11:21:54 +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
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
朱金勇
e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
zhengrunyu
9cb5cb1134 * Add api for resolve bug. 2022-04-12 14:40:48 +08:00
tianshujie
f2aa066bdc * Fix bug #19261. 2022-04-11 13:19:18 +08:00
xieqiyu
d8774117b9 * Fix bug#21290. 2022-04-06 15:36:20 +08:00
孙华伟
1612f6aabd Optimize the code. 2022-04-02 17:08:34 +08:00
孙华伟
c6327139bc Optimize the code. 2022-04-02 01:32:33 +00:00
孙华伟
a58fc45e20 Optimize the code. 2022-04-02 08:47:38 +08:00
孙华伟
41f03ea9ce *Fix bug#20336. 2022-04-01 10:09:44 +08:00
xieqiyu
2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
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