Commit Graph

821 Commits

Author SHA1 Message Date
wangyidong
63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
lanzongjun
91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
lanzongjun
71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun
1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00
tianshujie
1f9d835e39 * Finish task #61965. 2022-07-26 11:36:18 +08:00
tianshujie
02b9139e86 * Finish task #61965. 2022-07-26 10:01:25 +08:00
liuruogu
63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
daitingting
be44e76cb9 * Finish task #59646. 2022-07-05 09:20:47 +00:00
hufangzhou
cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
tanghucheng
d6722bbfbc * Fix bug #23978. 2022-06-28 20:23:40 +08:00
王怡栋
f72b89a56e Merge branch 'sprint/master_zhouxudong_57848' into 'master'
Sprint/master zhouxudong 57848

See merge request easycorp/zentaopms!4085
2022-06-23 00:39:59 +00:00
zhouxudong
666be69169 * Finish task #57848. 2022-06-23 00:33:03 +00:00
zhouxudong
8c4cd735e5 * Finish task #57848. 2022-06-22 10:00:49 +00:00
zhouxudong
3c091e8281 * Finish task #57848. 2022-06-22 09:46:26 +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
tianshujie
7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
zhouxudong
32c34c35e9 * Finish task #57880 #57881 #57866. 2022-06-20 07:43:08 +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
tianshujie
025fc5b0b0 * Fix bug #22139. 2022-05-05 10:09:40 +08:00
liumengyi
69cac92d99 * Fix bug #14472. 2022-04-28 11:26:06 +08:00
tianshujie
f5d69d5c30 * Fix bug #12154. 2022-04-26 11:14:54 +08:00
xieqiyu
f5a269af8a * Fix bug#1736. 2022-04-24 10:48:14 +08:00
zenggang
0ef2e99bca * Fix bug#21876 2022-04-22 02:29:51 +00:00
xieqiyu
4abb324459 * Fix bug#21896. 2022-04-21 16:46:09 +08:00
sunjun
d2325e9b93 *Fixbug_sunjun_21811 2022-04-20 16:05:26 +08:00
李玉春
e13aed8c7c Merge branch 'fixbug_sunjun_19262' into 'master'
*Fixbug_sunjun_19262

See merge request easycorp/zentaopms!2985
2022-04-18 07:52:30 +00:00
sunjun
0aa9ee7db1 *Fixbug_sunjun_19262 2022-04-18 14:21:57 +08:00
sunjun
efb1b2eee2 *Fixbug_sunjun_19262 2022-04-18 14:16:04 +08:00
sunjun
ccca03fb97 *Fixbug_sunjun_qijian 2022-04-16 22:52:43 +08:00
sunjun
db0fd23155 *Fixbug_sunjun_qijian 2022-04-16 22:46:42 +08:00
zhouxudong
e6ceaf1201 * Fix bug #17353. 2022-04-15 09:05:10 +08:00
zhouxudong
40aaa97681 * Fix bug #17353. 2022-04-14 17:05:38 +08:00
zhouxudong
7fe4729a58 * Fix bug #17353. 2022-04-14 16:58:37 +08:00
sunjun
38aa249dac *Fixbug_sunjun#21630 2022-04-14 13:08:59 +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
周旭东
e9e20ffae0 Update control.php 2022-04-13 07:24:55 +00:00
zhouxudong
dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
zhouxudong
37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
zhouxudong
19f499e121 * Fix bug #17994. 2022-04-13 10:36:39 +08: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
zenggang
654da8565f * Fix bug#21649,21512 2022-04-12 03:15:39 +00:00
xieqiyu
7892d031e4 * Fix bug#21468. 2022-04-07 11:18:58 +08:00
孙广明
1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
2022-04-02 06:49:30 +00:00
王怡栋
4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
liyuchun
4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
Zongjun Lan
bbea31bd09 * fix bug #20256 2022-04-01 10:01:48 +08:00
Zongjun Lan
733cbedc1e * fix bug #21005 2022-03-25 14:26:17 +08:00