Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
69,410 Commits 2 Branches 292 Tags
e77db07eb2c4bcde646bbd8f8cce94de5e62bee8
Commit Graph
323 Commits
Author SHA1 Message Date
daitingting 8ac45fbbc6 * Rename abbr. 2023-05-30 09:32:33 +00:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
tianshujie 587ff87934 * Fix bug #29843. 2023-03-09 13:25:06 +08:00
caoyanyi e409352d47 * Code for bug #28726. 2023-03-08 17:09:27 +08:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master' 
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
 2023-03-01 09:13:25 +00:00
tianshujie 046187237e * Code for fix bug #32561. 2023-03-01 16:35:24 +08:00
liumengyi aac54b6978 * Fix bug #32157. 2023-03-01 07:12:48 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liuhong a08eff199f * Fix bug #30907. 2022-12-15 08:12:15 +00:00
wangyidong 6391ddfe1e * adjust style. 2022-12-15 10:11:25 +08:00
wangyidong 8dc609e4a0 * code task #79859,79858,79857,79856,79855,79854. 2022-12-13 14:15:39 +08:00
wangyidong d64a93ea2b * code task #79282. 2022-12-09 17:13:06 +08:00
孙广明 2fdb547f3e Merge branch 'master' into 'master_271_78665' 
# Conflicts:
#   module/build/control.php
 2022-12-09 08:58:55 +00:00
lanzongjun 9158f6f79f * Fix Bug #30616 2022-12-09 15:38:54 +08:00
lanzongjun 1b4791f74b * Fix build create 2022-12-08 15:45:36 +08:00
lanzongjun d8a5944a84 * Finish Bug 2022-12-08 15:15:49 +08:00
liuhong 0094f902f5 * Finish Task #78665. 2022-12-08 06:55:05 +00:00
wangyidong 3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
liuhong ec810545d5 * draft code for #78665. 2022-12-08 00:19:26 +00:00
lanzongjun 04cb6a9cac * Finish Bug #30616 2022-12-07 15:53:10 +08:00
lanzongjun 15d16d3eb6 add default branchName 2022-12-07 09:50:09 +08:00
lanzongjun a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
lanzongjun 4cbf1397b8 * Finish Task #78671 2022-12-06 17:18:57 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
wangyidong 58596cacf1 * code task #78913. 2022-12-06 14:17:18 +08:00
wangyidong 45e8ff4f1a * code for task #78912. 2022-12-06 13:54:14 +08:00
wangyidong 0f1de8b84f * code for task #78911 2022-12-06 13:43:17 +08:00
lanzongjun 9746936437 * Finish Task #78664 2022-12-05 16:22:32 +08:00
wangyidong 8d41badb9e * code for task #77242. 2022-11-29 15:50:49 +08:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
王怡栋 cbeb50efbb Merge branch 'zentaopms_263_bug#30033' into 'master' 
* Fix bug #30033.

See merge request easycorp/zentaopms!6358
 2022-11-24 05:09:30 +00:00
wangyuting 3075732c2b * Fix bug #30033. 2022-11-24 05:01:52 +00:00
wangyuting 38fc1d6599 * Fix bug #30138. 2022-11-24 00:50:40 +00:00
王怡栋 d98c9413f0 * fix bug #30074. 2022-11-23 11:09:47 +08:00
王怡栋 44caf18a51 Merge branch 'zentaopms_263_task#77130' into 'master' 
* Finish task #77130.

See merge request easycorp/zentaopms!6292
 2022-11-22 06:01:07 +00:00
王怡栋 3ac62d87a1 * code for task #77138. 2022-11-22 12:07:53 +08:00
wangyuting 5cb3016f3f * Finish task #77130. 2022-11-22 03:01:03 +00:00
wangyuting a35818ef8c * Fix unlink btn class bug. 2022-11-18 02:27:28 +00:00
王怡栋 e4c02e2857 Merge branch 'zentaopms_258_task#76435' into 'master' 
* Finish task #76435、76436、76437.

See merge request easycorp/zentaopms!6234
 2022-11-17 08:47:30 +00:00
wangyuting 97073567df * Finish task #76435、76436、76437. 2022-11-17 08:42:31 +00:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
wangyuting 11343aa6cc * Fix bug #29700. 2022-11-15 05:15:35 +00:00
daitingting 8c70b80f78 * Fix bug #29713. 2022-11-15 02:51:12 +00:00
wangyuting f16bef503e * Fix bug. 2022-11-14 07:59:22 +00:00
wangyuting bb5b3426f6 * Finish task #76032. 2022-11-14 07:55:25 +00:00
wangyuting e94c895d51 * Optimize code. 2022-11-11 07:22:33 +00:00
wangyuting 2f5e0ac70d * Finish task #75239. 2022-11-11 00:46:54 +00:00
wangyuting 8559d77319 * Optimize code. 2022-11-10 08:09:17 +00:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00