Commit Graph
503 Commits
Author SHA1 Message Date
wangyidong 8ee7afc941 * fix bug #24104. 2022-06-29 13:26:58 +08:00
tanghucheng e656139643 * Fix bug . 2022-06-29 08:48:23 +08:00
tanghucheng ba0b9139b5 * Fix bug #24114. 2022-06-28 20:47:56 +08:00
xieqiyu f617a45203 * Finish task#58603. 2022-06-28 11:25:15 +08:00
孙广明 58f7fb77dd Merge branch 'sprint/209_hufangzhou_24385' into 'master'
* Fix bug #24385.

See merge request easycorp/zentaopms!4156
2022-06-28 01:24:08 +00:00
tanghucheng 6c923d96cb * Fix bug for lite. 2022-06-28 08:30:45 +08:00
hufangzhou a1825d59d8 * Fix bug #24385. 2022-06-27 17:09:48 +08:00
zhouxudong 74808b486e * Fix bug. 2022-06-23 01:33:32 +00:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
tanghucheng 1968070dd4 * Fix bug #24078. 2022-06-22 15:44:26 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
王怡栋 dba55ec299 Merge branch 'sprint/205_zhouxudong_57872' into 'sprint/205'
Sprint/205 zhouxudong 57872

See merge request easycorp/zentaopms!4040
2022-06-21 06:04:16 +00:00
zhouxudong 4dd1445e8b * Finish task #57872. 2022-06-21 05:48:57 +00:00
zhouxudong e3ae6ed6a0 * Finish task #57871. 2022-06-21 01:31:23 +00:00
王怡栋 4739911510 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766

See merge request easycorp/zentaopms!4022
2022-06-20 07:49:59 +00:00
lanzongjun d5afe20770 * fix bug #23766 2022-06-20 15:46:10 +08:00
王怡栋 946d5cb782 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766

See merge request easycorp/zentaopms!4015
2022-06-20 03:18:59 +00:00
lanzongjun 6786b4d08c * fix bug #23932 2022-06-20 11:17:34 +08:00
tanghucheng 09268cfe23 * Fix bug . 2022-06-20 10:50:54 +08:00
lanzongjun 2c49643589 * fix bug #23766 2022-06-20 09:40:46 +08:00
liumengyi 4961913efe * Optimize code. 2022-06-17 14:15:33 +08:00
xieqiyu 16bb61a2ec * Fix bug#23669. 2022-06-15 18:17:18 +08:00
zhouxudong 26a57e00cd * Fix bug #23543 #23434 #23427 #23419. 2022-06-13 04:24:33 +00:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
王怡栋 95fa3f04e1 Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.

See merge request easycorp/zentaopms!3830
2022-06-09 07:25:39 +00:00
tanghucheng 181fb38e7e * Fix bug #23125. 2022-06-09 15:11:51 +08:00
tanghucheng 87e879e047 * Fix bug #23474,23474. 2022-06-09 14:34:11 +08:00
tanghucheng 3c78c49df0 * Fix bug for lite kanban. 2022-06-09 11:30:35 +08:00
liumengyi be664e6368 * Fix bug. 2022-06-08 15:23:00 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tanghucheng 146d8f9f38 * Fix bug . 2022-06-07 17:03:57 +08:00
tanghucheng 0e24f99f82 * Fix bug for lite. 2022-06-07 12:10:33 +08:00
tanghucheng 2200dadea6 * Fix bug #23267. 2022-06-06 11:16:08 +08:00
tanghucheng c9daed297e * Fix bug #23105. 2022-06-01 08:41:04 +08:00
hufangzhou 2e494852df * Fix bug #23093. 2022-05-31 13:58:25 +08:00
王怡栋 2bdca017ca Merge branch 'sprint/189_package_lanzongjun' into 'master'
* fix bug #23002

See merge request easycorp/zentaopms!3633
2022-05-27 05:12:18 +00:00
lanzongjun c86bf9d730 * fix bug #23002 2022-05-26 17:23:32 +08:00
tanghucheng fa823c4c32 * Fix bug #23001,23005. 2022-05-26 08:44:23 +00:00
唐胡成 834ffeeb1c Update lite.php 2022-05-20 05:06:24 +00:00
tanghucheng 52e57b3f16 * Fix bug. 2022-05-20 03:54:36 +00:00
wangyidong ee559e5e7c * code for bug #22376. 2022-05-13 08:47:42 +08:00
wangyidong 71bc27b631 * fix bug #22433. 2022-05-13 08:27:44 +08:00
王怡栋 a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
tanghucheng 32fe42bb94 * Fix bug. 2022-04-28 10:45:30 +08:00
tanghucheng 99fff4eda6 * Fix bug #22028. 2022-04-28 10:38:08 +08:00
wangyidong 899c123dac * code for bug #19303. 2022-04-27 09:37:01 +08: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
tanghucheng bc1a55d155 * Fix bug #14850. 2022-04-24 13:39:19 +08:00
caoyanyi 210d2fb29f * Fix bug #21322. 2022-04-22 05:07:13 +00:00