Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
24,975 Commits 2 Branches 292 Tags
48a545ea4d192afb31e8b960d2247b4cb0e16495
Commit Graph
24975 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie98 48a545ea4d * Adjust code. 2021-06-30 14:07:47 +08:00
tianshujie98 fed23d507d * Adjust code. 2021-06-30 11:02:08 +08:00
tianshujie98 9f967a7635 * Adjust code. 2021-06-30 10:58:21 +08:00
tianshujie98 7653154b20 * Adjust code. 2021-06-30 10:28:51 +08:00
tianshujie98 584823089c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-29 16:45:14 +08:00
tianshujie98 49d1c35356 * Adjust code. 2021-06-29 16:44:54 +08:00
guanxiying 2b8b7c6555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-29 16:44:54 +08:00
guanxiying 1915b9558d * Add the getByIdList function in doc module. 2021-06-29 16:44:50 +08:00
holan20180123 84b1280ab0 * Adjust save user acl. 2021-06-29 16:05:16 +08:00
tianshujie98 e9cbc7b383 * Adjust code. 2021-06-29 15:08:33 +08:00
holan20180123 ae7e631f90 * Add import doc to asset. 2021-06-29 14:22:06 +08:00
holan20180123 7b7ff8d209 * Adjust js locate. 2021-06-29 11:11:14 +08:00
qiyu-xie 7fa1167376 * Fix bug#12376. 2021-06-29 09:29:03 +08:00
tianshujie98 facb35a4e5 * Adjust code. 2021-06-29 09:23:37 +08:00
tianshujie98 71e268a06b * Adjust code. 2021-06-28 16:24:01 +08:00
holan20180123 690594741c * Adjust action link. 2021-06-28 15:53:20 +08:00
holan20180123 db8a1a3c58 * Adjust import stroy to lib. 2021-06-28 14:06:27 +08:00
tianshujie98 2f3033138f * Adjust code. 2021-06-28 13:09:58 +08:00
tianshujie98 626f7346fa * Adjust code. 2021-06-28 13:03:16 +08:00
holan20180123 a55ddb6bd7 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-28 11:37:33 +08:00
qiyu-xie 082ced2d7d * Modify import from lib action. 2021-06-28 11:34:32 +08:00
qiyu-xie 9c21bf6aa6 * Finish task#39576. 2021-06-28 11:03:28 +08:00
holan20180123 57dee3d6a4 * Add action link for asset lib. 2021-06-28 10:03:47 +08:00
holan20180123 cb12197a3b Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-28 08:13:30 +08:00
guanxiying afb01a3a95 * Adjust the code. 2021-06-25 16:41:05 +08:00
holan20180123 1d600ede32 * Adjust import to asset lib. 2021-06-25 16:29:59 +08:00
wangyidong eba2dbfaab * adjust for svn diff to repo. 2021-06-25 11:19:09 +08:00
holan20180123 c7e4084d78 * Batch import stories to lib. 2021-06-25 09:12:36 +08:00
holan20180123 0ee9f999ea * Code for task #39518. 2021-06-24 16:31:12 +08:00
tianshujie98 16b137a9a0 * Add method of caselib module. 2021-06-24 09:07:48 +08:00
Hao Sun e41fc21ece * add new icon: icon-assets and icon-diamond. 
# Conflicts:
#	www/theme/zui/fonts/ZentaoIcon.eot
#	www/theme/zui/fonts/ZentaoIcon.ttf
#	www/theme/zui/fonts/ZentaoIcon.woff
 2021-06-23 15:41:56 +08:00
tianshujie98 166decfa53 * Fix bug of doc module. 2021-06-22 09:18:53 +08:00
tianshujie98 ab450196b2 * Fix bug #13268. 2021-06-21 13:58:50 +08:00
tianshujie98 4369c928d8 * Fix the problem of batch creation todo. 2021-06-21 13:17:24 +08:00
tianshujie98 c38c99e0a8 * Fix bug. 2021-06-18 16:17:04 +08:00
tianshujie98 8004b37132 * Fix bug #13257. 2021-06-18 15:51:25 +08:00
holan20180123 ff1360bcda Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-18 14:54:46 +08:00
holan20180123 caccf6b229 * Adjust webhook send message. 2021-06-18 14:53:12 +08:00
tianshujie98 4c792a2318 * Fix bug. 2021-06-18 14:41:03 +08:00
tianshujie98 637a3c29e4 * Fix bug. 2021-06-18 14:16:02 +08:00
tianshujie98 00985acb35 * Fix bug 13246. 2021-06-18 13:36:50 +08:00
tianshujie98 be0f4320e6 * Fix bug #13248. 2021-06-18 11:25:28 +08:00
holan20180123 812d48e9b5 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-18 10:27:57 +08:00
holan20180123 5fdf41d62f * Fix bug #13234. 2021-06-18 10:27:27 +08:00
wangyidong 936816dc1a Merge branch '15.0.beta1' 2021-06-18 10:21:23 +08:00
王怡栋 5f15025297 Merge branch 'master' into '15.0.beta1' 
# Conflicts:
#   module/upgrade/control.php
 2021-06-18 02:19:40 +00:00
王怡栋 8c9c237236 Merge branch '15.0.beta3' into 'master' 
15.0.beta3

See merge request easycorp/zentaopms!2
 2021-06-18 02:17:49 +00:00
Hao Sun c8eadb2ce9 * update datetimepicker. 2021-06-18 09:54:48 +08:00
tianshujie98 57d390129c Fix an error. 2021-06-18 09:54:11 +08:00
hufangzhou 5ee795330e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-18 09:25:54 +08:00