Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
42,490 Commits 2 Branches 292 Tags
3cb2736d3be32bbbb6f1422ffddefcecaab718cd
Commit Graph
817 Commits
Author SHA1 Message Date
孙广明 e8cedee6bb * Code for code error. 2022-07-20 13:49:10 +08:00
孙广明 9f1847d55b * Code for code error. 2022-07-20 09:35:30 +08:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
liumengyi 38a91dba02 * Optimize code for task#60395. 2022-07-11 14:52:26 +08:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
liumengyi 1681419642 * Fix bug for sort module. 2022-07-08 09:03:00 +08:00
liumengyi bb9ce6dd49 * Fix bug #24920. 2022-07-07 16:58:27 +08:00
liumengyi 696183b811 * Fix bug of task #59480. 2022-07-07 16:01:26 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
liumengyi eb6901ee34 * Fix bug #24949. 2022-07-07 10:29:37 +08:00
王怡栋 5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master' 
* Finish task #59482.

See merge request easycorp/zentaopms!4395
 2022-07-07 01:49:35 +00:00
liumengyi c8b30d557a * Optimize code for task #59482. 2022-07-07 09:48:17 +08:00
liumengyi 7c7a7689d6 * Fix bug #24910. 2022-07-06 17:23:17 +08:00
liumengyi 92fbca540e * Fix bug #24910. 2022-07-06 17:20:54 +08:00
liumengyi 73fe07dd49 * Finish task #59482. 2022-07-06 16:18:44 +08:00
王怡栋 14b88ef75e Merge branch 'sprint/211_liumengyi_59469' into 'master' 
* Finish task #59469.

See merge request easycorp/zentaopms!4372
 2022-07-06 06:17:57 +00:00
liumengyi 100f1daf7e * Add annotation. 2022-07-06 14:10:37 +08:00
liumengyi fae194b655 * Remove blank line. 2022-07-06 13:46:42 +08:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
liumengyi f6169c53b5 * Finish task #59469. 2022-07-05 20:47:47 +08:00
liumengyi 2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
王怡栋 62f030b82d Merge branch 'sprint/zdoo18_wangyuting' into 'master' 
* Fix bug #23438.

See merge request easycorp/zentaopms!3800
 2022-06-08 09:12:48 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
wangyuting2 2d4f9f8644 * Add notes. 2022-06-08 17:03:52 +08:00
wangyuting2 ca92edbf95 * Fix bug #23438. 2022-06-08 17:01:08 +08:00
wangyuting2 463643ff83 * Fix bug. 2022-06-08 15:53:32 +08:00
wangyuting2 3fb390115c * Add processing of datasource viewType. 2022-06-08 14:23:42 +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
xieqiyu 39959d08e9 * Fix bug#54483. 2022-05-17 15:08:06 +08:00
tianshujie ca81c5afba * Fix bug #22370. 2022-05-12 09:09:41 +08:00
朱金勇 4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master' 
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
 2022-04-22 01:36:54 +00:00
renying d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +08:00
zhouxudong 1741957f2d * Fix bug from max #17536. 2022-04-21 09:48:13 +08:00
renying b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
周旭东 a46767fc3d Update control.php 2022-04-21 01:12:13 +00:00
周旭东 ee649fba71 Update zh-cn.php 2022-04-21 01:11:00 +00:00
zhouxudong 9f6fc42c11 * Fix bug from max #17536. 2022-04-21 09:09:00 +08:00
hufangzhou 8303f2f39d * Fix bug #18295. 2022-04-19 15:04:06 +08:00
孙华伟 a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
liumengyi 51aa9835f6 * Add unit test of tree. 2022-04-15 14:35:38 +08:00
孙华伟 ae2609a926 *No warp. 2022-04-14 15:32:50 +08:00
孙华伟 d5f6c531d9 *An error has been reported on other pages. 2022-04-14 10:32:28 +08:00
孙华伟 93beba2f03 *Fix bug#18295. 2022-04-14 08:32:47 +08:00
孙广明 6ef66fd6ef Merge branch 'master_xieqiyu_21385' into 'master' 
* Fix bug#21385.

See merge request easycorp/zentaopms!2885
 2022-04-12 08:32:47 +00:00