Commit Graph
833 Commits
Author SHA1 Message Date
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu 1d2ca05e50 * Fix bug#23154. 2022-06-02 03:54:17 +08:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
tianshujie 3e10f3d0c9 * Finish task #55675. 2022-06-01 14:25:44 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +08:00
zhouxudong 71a55f5dcf * Finish task #55623. 2022-06-01 01:37:18 +00:00
zhouxudong 02d3db0b44 * Finish task #54998. 2022-05-25 01:23:51 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
liumengyi b70e6047db * Fix bug for batch assign. 2022-05-19 16:33:20 +08:00
王怡栋 3368eddc78 Merge branch 'sprint/192_hufangzhou_bugreport' into 'master'
# Finish task #54484,#54485,#54486.

See merge request easycorp/zentaopms!3514
2022-05-19 06:28:41 +00:00
hufangzhou 0a7b3d4786 * Adjust the color. 2022-05-19 13:54:14 +08:00
zhouxin 8a2e6d63cb * Fix bug. 2022-05-19 03:07:55 +00:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
zhouxudong 9e4d86d6d8 * FIx bug #22523. 2022-05-16 05:54:54 +00:00
zhouxudong 89a150e856 * Fix bug #22523. 2022-05-16 05:48:54 +00:00
孙广明 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