Commit Graph
32185 Commits
Author SHA1 Message Date
李玉春 409115aaaa Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3106
2022-04-25 05:33:23 +00:00
sunjun 1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
tianshujie 873fabb024 * Fix bug #21970. 2022-04-25 10:50:46 +08:00
wangyidong 580132c2c8 * code for bug #18347. 2022-04-25 10:36:08 +08:00
tianshujie 42676bf558 * Adjust the scope of modules when searching for bugs. 2022-04-25 01:27:24 +00:00
wangyidong bf252f261c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-25 08:56:04 +08:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
王怡栋 4f1690ca0e Merge branch 'liyuchun_fixbug_14805' into 'master'
* Fix bug #14805.

See merge request easycorp/zentaopms!3104
2022-04-24 09:26:29 +00:00
王怡栋 4f111c37f3 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
Sprint/master lanzongjun fixbug

See merge request easycorp/zentaopms!3103
2022-04-24 09:24:42 +00:00
王怡栋 b69bc3989d Merge branch 'master_xieqiyu_2974' into 'master'
* Fix bug#2974.

See merge request easycorp/zentaopms!3100
2022-04-24 09:24:13 +00:00
liyuchun d960846c16 * Fix bug #14805. 2022-04-24 09:10:01 +00:00
Zongjun Lan eb0be01303 * fix bug #18249 2022-04-24 16:09:00 +08:00
wangyidong c2f6b3220a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-24 16:08:55 +08:00
wangyidong a7bc51b608 * code bug #18835. 2022-04-24 16:08:28 +08:00
zhengrunyu bc86b34e6d * Delete black. 2022-04-24 16:00:55 +08:00
zhengrunyu 0001e7b16b * Fix bug 21319. 2022-04-24 15:58:25 +08:00
liumengyi 78bd314db5 * Fix bug #13255. 2022-04-24 15:50:21 +08:00
xieqiyu cf9add7555 * Fix bug#2974. 2022-04-24 15:48:13 +08:00
王怡栋 0faf44af53 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/stage/model.php
2022-04-24 07:02:51 +00:00
王怡栋 3cf83a54c6 Merge branch 'master_xieqiyu_1736' into 'master'
* Fix bug#1736.

See merge request easycorp/zentaopms!3094
2022-04-24 07:00:20 +00:00
王怡栋 480ca71da8 Merge branch 'fixbug' into 'master'
* Fix bug #17602,14850,21439.

See merge request easycorp/zentaopms!3097
2022-04-24 07:00:04 +00:00
王怡栋 048688e7e0 Merge branch 'sprint/fixbug_hufangzhou_17335' into 'master'
* Fix bug #17335.

See merge request easycorp/zentaopms!3095
2022-04-24 06:45:34 +00:00
王怡栋 1b25be3932 Merge branch 'master_xieqiyu_21947' into 'master'
* Fix bug#21947.

See merge request easycorp/zentaopms!3092
2022-04-24 06:42:36 +00:00
王怡栋 9d96c4d3ac Merge branch 'liyuchun_fixbug_7008' into 'master'
* Fix bug #7008.

See merge request easycorp/zentaopms!3071
2022-04-24 06:41:59 +00:00
tanghucheng c72bd0a1df * Fix bug #18209. 2022-04-24 14:27:19 +08:00
liyuchun 65a55d4fc8 * Fix bug #21960. 2022-04-24 06:26:15 +00:00
lanzongjun e011e6c2f0 * fix bug #18210 2022-04-24 14:11:33 +08:00
tanghucheng cbec525102 * Fix bug #17602. 2022-04-24 13:55:08 +08:00
tanghucheng bc1a55d155 * Fix bug #14850. 2022-04-24 13:39:19 +08:00
hufangzhou 1acb25fc6c * Fix bug #17335. 2022-04-24 11:02:17 +08:00
xieqiyu f5a269af8a * Fix bug#1736. 2022-04-24 10:48:14 +08:00
李玉春 933de97931 Merge branch 'mayue_fix_bug#21948' into 'master'
* Fix bug #21948.

See merge request easycorp/zentaopms!3091
2022-04-24 01:59:05 +00:00
mayue 181d0d67de * Fix bug #21948. 2022-04-24 09:58:10 +08:00
李玉春 49708b72a0 Merge branch 'master' into 'cyy_21322'
# Conflicts:
#   module/api/control.php
2022-04-24 01:56:10 +00:00
tanghucheng 76c0462119 * Fix bug #21439. 2022-04-24 01:53:07 +00:00
xieqiyu 3a533b72c9 * Fix bug#21947. 2022-04-24 09:48:31 +08:00
mayue 2ed8646488 * Fix bug #21948. 2022-04-24 09:31:14 +08:00
caoyanyi 8d21788052 * Modify export data. 2022-04-24 09:21:54 +08:00
caoyanyi be8dd4535c * Modify editor file path for app. 2022-04-24 08:48:26 +08:00
zhengrunyu c1d6baa91a * Add black. 2022-04-24 08:45:49 +08:00
zhengrunyu 24530f75ca * When create story can choise parent story. 2022-04-24 08:40:45 +08:00
Hao Sun abb3d4cf84 * refactor. 2022-04-22 17:12:20 +08:00
Hao Sun ea91c10200 * fix loop redirect in safari. 2022-04-22 17:11:12 +08:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
xieqiyu 63032ffe42 * Fix bug#21936. 2022-04-22 15:57:57 +08:00
孙广明 514aa68dc9 Merge branch 'sprint/fixbug_hufangzhou_18167' into 'master'
* Fix bug #18167.

See merge request easycorp/zentaopms!3086
2022-04-22 07:37:27 +00:00
hufangzhou 98153aa83b * Rename the variable. 2022-04-22 15:37:10 +08:00
hufangzhou 0c57308663 * Fix bug #18167. 2022-04-22 15:29:27 +08:00
wangyidong 8c9bf2550f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-22 15:29:21 +08:00
wangyidong a08edd3336 * adjust for repo. 2022-04-22 15:29:06 +08:00