Commit Graph
1121 Commits
Author SHA1 Message Date
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
wangzemei b11a919ccd * Fix bug #24000 2022-06-21 06:08:36 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
leiyong b6f5c18dc9 * Finish task#56933. 2022-06-14 07:56:43 +00:00
孙广明 5c1f32c3d9 Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view

See merge request easycorp/zentaopms!3876
2022-06-13 02:06:00 +00:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
sunjun a69d10d9db sprint_194 add project in batchcreate view 2022-06-10 06:36:12 +00:00
孙广明 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
sunjun 1c8db1da3a fixbug_sunjun_22531 2022-06-01 09:14:12 +00:00
zhouxudong 71a55f5dcf * Finish task #55623. 2022-06-01 01:37:18 +00:00
lanzongjun 36010b797f * fix bug #54940 2022-05-25 15:58:26 +08:00
lanzongjun 0a84e5fb81 * fix bug #54940 2022-05-25 15:51:48 +08:00
李玉春 19718e6249 Merge branch 'master' into 'sprint_sunjun_55259'
# Conflicts:
#   module/bug/view/batchcreate.html.php
2022-05-25 02:31:37 +00:00
sunjun ca20a35a26 sprint_sunjun_55259 2022-05-25 01:34:10 +00:00
daitingting e2f7c10296 * Set default value in getFieldControl function, finish task #54954. 2022-05-25 01:03:06 +00:00
hufangzhou 0a7b3d4786 * Adjust the color. 2022-05-19 13:54:14 +08:00
hufangzhou 775a397395 * Finish task #54484,#54485,#54486. 2022-05-19 11:09:53 +08:00
zhouxudong 48c052efad * Fix bug #22531. 2022-05-16 09:23:29 +00:00
hufangzhou 3680af6833 * Finish task #53673. 2022-05-11 10:05:09 +08:00
wangyuting2 45ae4de775 * Do task 53548. 2022-05-09 09:20:01 +08:00
mayue 5da98433b6 * Fix bug #19933#21785. 2022-04-21 16:30:32 +08:00
孙广明 e4295fdbe5 * Code for workflow bug. 2022-04-21 10:40:56 +08:00
孙广明 7fb3a62058 * Fix workflow bug. 2022-04-21 10:24:25 +08:00
孙广明 e4738c50ea * Add required to workflow field. 2022-04-20 13:08:20 +08:00
孙广明 313e39712c * Fix workflow bug. 2022-04-20 10:17:16 +08:00
孙广明 18fa7382dd * Fix workflow bug. 2022-04-19 16:39:44 +08:00
wangxiaomeng 8a5e5c12d5 fix_bug#17253 2022-04-15 14:27:51 +08:00
wangxiaomeng c1a51d747c fix_bug #17253 2022-04-15 14:07:42 +08:00
tianshujie f6cf76e520 * Fix bug #19261. 2022-04-13 09:18:15 +08:00
xieqiyu f72da77a5d * Code for bug#20875. 2022-03-28 13:52:42 +08:00
xieqiyu f500822991 * Fix bug#20875. 2022-03-28 10:11:39 +08: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
xieqiyu f1aa12aae3 * Fix bug. 2022-03-22 09:36:32 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong a778efdbb8 * Fix bug #16264. 2022-03-17 13:12:18 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +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
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
tianshujie 06701aa5a0 * Fix style issues when raising bugs. 2022-03-09 09:34:52 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
孙华伟 c7f5c1f255 * 2022-03-08 14:43:41 +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
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00