Commit Graph
517 Commits
Author SHA1 Message Date
lanzongjun edb3c69e87 * fix bug #22008 2022-04-27 15:27:05 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
tianshujie c595eaa0d5 * Fix bug #21830. 2022-04-19 10:49:03 +08:00
李玉春 50e153d0df Merge branch 'devops26_52602' into 'master'
Fix bug#15760,12963

See merge request easycorp/zentaopms!2910
2022-04-13 09:36:30 +00:00
tianshujie d41521bbcc * Fix bug #21699. 2022-04-13 14:53:33 +08:00
zenggang 0ed499a6d0 * Fix bug#12963 2022-04-13 06:48:32 +00:00
李玉春 69a8379657 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2806
2022-04-07 09:09:04 +00:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
xieqiyu d6ab24caff * Fix bug#21552. 2022-04-07 13:53:41 +08:00
王怡栋 4f5529867b * code for bug #20933. 2022-04-06 13:13:29 +08:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie a9b0b2127a * Fix bug #21401. 2022-04-02 10:26:41 +08:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
tianshujie 6efb224b7b * Fix bug #18033. 2022-04-01 13:39:36 +08:00
孙广明 e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明 5072b8929b Merge branch 'sprint/master_zhouxudong_18002' into 'master'
Sprint/master zhouxudong 18002

See merge request easycorp/zentaopms!2659
2022-03-31 02:37:33 +00:00
zhouxudong fb5a792fee * Fix bug #18002. 2022-03-31 10:05:31 +08:00
xieqiyu 79d9664263 * Fix bug#18002. 2022-03-30 20:48:33 +08:00
xieqiyu af7f9bd8e3 * Fix bug#18270. 2022-03-30 20:22:17 +08:00
tianshujie 4f4dfd990e * Optimize code logic. 2022-03-30 15:22:27 +08:00
zhouxudong c86e39c093 * Fix bug #18002 #19684. 2022-03-30 14:26:24 +08:00
tianshujie be96ca9323 * Fix bug #16060. 2022-03-30 13:42:39 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
zhouxudong 6b9eddc355 * Fix bug #18002. 2022-03-30 09:35:59 +08:00
zhouxudong ecf749b7da * Fix bug #18002. 2022-03-29 16:59:33 +08:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
songchenxuan 310a946e0a * Check locate if api. 2022-03-29 11:17:08 +08:00
tianshujie c7225ac3d6 * Fix bug #14433. 2022-03-28 17:19:29 +08:00
tianshujie cd2e539a6d * Fix bug #21212. 2022-03-28 13:56:04 +08:00
李玉春 c458dab32a Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072

See merge request easycorp/zentaopms!2496
2022-03-24 02:40:57 +00:00
tianshujie 9178a6e3b3 * Modify variable name. 2022-03-24 10:27:42 +08:00
tianshujie e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
李玉春 6729298c92 Merge branch 'bugfix_cyy' into 'master'
Modify app language and API

See merge request easycorp/zentaopms!2488
2022-03-24 00:29:54 +00:00
孙广明 337f12b7e3 Merge branch 'master_xieqiyu_20930' into 'master'
* Fix bug#20930.

See merge request easycorp/zentaopms!2462
2022-03-23 05:53:02 +00:00
zhouxudong 9acef59ced * Fix bug #17053. 2022-03-23 13:31:52 +08:00
caoyanyi 19e7095e6c * Fix bug #21075. 2022-03-23 13:11:39 +08:00
xieqiyu c614eb44e4 * Fix bug#20930. 2022-03-23 09:03:41 +08:00
zhouxin 89a56dc374 * Fix bug #18746. 2022-03-22 08:35:13 +00:00
李玉春 26f84d495d Merge branch 'sprint/master_zhouxudong_16575' into 'master'
Sprint/master zhouxudong 16575

See merge request easycorp/zentaopms!2453
2022-03-22 08:18:36 +00:00
zhouxudong 81e4aa867a * Fix bug #16575. 2022-03-22 16:14:28 +08:00
李玉春 56e4317e23 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2447
2022-03-22 07:55:27 +00:00
tianshujie 5458aeeff9 * Delete useless judgment conditions. 2022-03-22 15:54:03 +08:00
tianshujie 69e1f67fbd * Fix bug #21054. 2022-03-22 14:32:52 +08:00
zhouxin cc2704e1d0 Fix bug #17415. 2022-03-22 05:10:45 +00:00
李玉春 7127d6e8ab Merge branch 'sprint/master_zhoxudong_15984' into 'master'
* Fix bug #15984.

See merge request easycorp/zentaopms!2419
2022-03-22 02:43:35 +00:00
zhouxudong d74e5c4c58 * Fix bug #15984. 2022-03-22 09:58:43 +08:00
zhouxin ddc8a8f724 Fix bug #17415. 2022-03-22 01:38:31 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
朱金勇 ec7c5022c8 Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
#   module/execution/control.php
2022-03-21 06:12:21 +00:00