Commit Graph

615 Commits

Author SHA1 Message Date
liumengyi
09cb859c5e * Fix bug #32179. 2023-02-18 09:30:25 +00:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
hufangzhou
56c2cdcb21 * Finish task #83954. 2023-02-14 02:46:34 +00:00
xieqiyu
7a0e43b41b * Code for bug#31453. 2023-02-02 14:12:29 +08:00
xieqiyu
1e11a3cb85 * Fix bug#31453. 2023-02-02 11:12:46 +08:00
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
zhouxin
bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
wangyidong
6c02c05d51 * fix bug #30676. 2022-12-15 09:18:46 +08:00
Yagami
a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
wangyidong
7c8f4674cf * code for task #78909. 2022-12-06 10:37:24 +08:00
孙广明
6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi
fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
Yagami
f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
liugang
7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
liumengyi
398afed7ae * Fix bug #29912. 2022-11-17 08:42:54 +08:00
caoyanyi
5145b98f24 * Modify actions get. 2022-11-14 16:24:49 +08:00
caoyanyi
f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyidong
126d55f807 * code task #74929. 2022-11-10 15:19:57 +08:00
liumengyi
9c1f8b2be1 * Fix bug #29325. 2022-11-08 13:02:01 +08:00
caoyanyi
1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong
bd18396178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-08 08:41:50 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie
c05b94e3b0 * Fix bug #29377. 2022-11-07 16:00:47 +08:00
caoyanyi
90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liumengyi
a38461a20e * Fix bug for manage chart group. 2022-11-06 16:03:14 +08:00
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong
f2cd7c12b4 * code for task #74779. 2022-11-02 14:21:24 +08:00
wangyidong
4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
xieqiyu
0a9a801389 * Code for task#74152. 2022-11-01 07:48:34 +00:00
wangyidong
40e20fa112 * code for task #74178. 2022-11-01 10:22:13 +08:00
tianshujie
0c2fd62c0a 8 Fix bug #29021. 2022-10-28 09:30:51 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
liyuchun
11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
lanzongjun
e1330d9de1 * fix bug 2022-10-20 14:48:30 +08:00
wangyidong
6c5ae13ce7 * fix bug #72263. 2022-10-18 13:45:12 +08:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang
e19ff62117 * Fix bug #28278. 2022-10-09 17:16:37 +08:00
wangyidong
8f6fd3919a * code for task #71605. 2022-10-09 11:16:58 +08:00
曹延义
0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00
tanghucheng
f6bb08d1e2 * Task#70756 Reduction shadow product. 2022-09-30 10:18:25 +08:00
xieqiyu
c303642c42 * Code for bug#26993. 2022-09-30 01:28:21 +00:00
xieqiyu
9b7dd7f98e * Fix bug#26993. 2022-09-30 01:26:18 +00:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong
a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
liyuchun
6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
王怡栋
14012809bd Merge branch 'sprint/fixbug_liumengyi_26595' into 'master'
* Optimize code for bug #26595.

See merge request easycorp/zentaopms!5559
2022-09-27 05:36:13 +00:00
liumengyi
cd63217eef * Fix bug #28010. 2022-09-27 11:12:29 +08:00