Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,844 Commits 2 Branches 292 Tags
0400a2628afcd2d7833babbcaabf80d74d76dce2
Commit Graph
792 Commits
Author SHA1 Message Date
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
xieqiyu 45b48305b7 * Fix bug#21385. 2022-04-12 13:28:32 +08:00
zhouxin 105874959c * Fix bug #21636. 2022-04-12 02:26:19 +00:00
孙广明 46d3ac142f Merge branch 'fixbugs_zhouxin_17354' into 'master' 
* Fix bug #17354.

See merge request easycorp/zentaopms!2870
 2022-04-11 09:25:29 +00:00
zhouxin c6b4f06bf4 * Fix bug #17354. 2022-04-11 08:54:22 +00:00
mayue 61bb5b08e8 * Fix bug #17286. 2022-04-11 16:01:45 +08:00
mayue 145b1766f7 * Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286.* Fix bug #17286. 2022-04-11 15:37:10 +08:00
孙广明 3e8175b22e Merge branch 'master_xieqiyu_21385' into 'master' 
* Fix bug#21385.

See merge request easycorp/zentaopms!2711
 2022-04-02 02:18:37 +00:00
xieqiyu c5eb774fdd * Fix bug#21385. 2022-04-01 14:24:05 +08:00
mayue 4084429fe6 * Fix bug #20316. 2022-03-31 15:48:35 +08:00
zhouxin bb47bfa04c * Fix bug #21333. 2022-03-31 06:02:31 +00:00
Zongjun Lan 195b13325e * fix bug #20811 2022-03-30 15:29:40 +08:00
zhujinyong e3ec91da2a + Add modules api. 2022-03-22 09:54:35 +08:00
zenggang d048268f4d * Finish task#51106 2022-03-18 06:20:44 +00:00
tianshujie 6efc56ebd1 * Fix bug #20506. 2022-03-09 13:39:35 +08:00
Zongjun Lan 5979f32712 * fix bug 20029 2022-03-02 15:04:12 +08:00
孙华伟 890532c727 *Fix bug #19959 #19963. 2022-02-24 15:08:20 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tianshujie 6ca88e549e * Fix bug #19046. 2022-01-27 10:25:44 +08:00
王怡栋 37d1c0e9e6 * code for task #47149. 2022-01-13 09:03:35 +08:00
songchenxuan 8927059720 *Code for code review. 2022-01-06 13:08:46 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
songchenxuan ea34d06dad *Fix task bug. 2021-12-30 14:51:33 +08:00
孙广明 aa60c24da5 * Fix code comment. 2021-12-29 17:19:31 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00