Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
24,957 Commits 2 Branches 292 Tags
626f7346fae3cbc263eedcf05db790acfd25a4cf
Commit Graph
24957 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hufangzhou b7caec933d * Adjust the code. 2021-06-18 09:25:50 +08:00
tianshujie98 abe711e334 * Finish task #39450. 2021-06-18 09:10:40 +08:00
tianshujie98 53cf8a8b2a * Finish task #39451. 2021-06-18 09:05:37 +08:00
qiyu-xie a73d28f969 * Finish task#39387. 2021-06-18 08:59:24 +08:00
hufangzhou db2212743b * Finish task #39452. 2021-06-18 08:05:38 +08:00
hufangzhou 23206c4ea8 * Finish task #39453. 2021-06-17 17:43:56 +08:00
tianshujie98 52246b07cc * Adjust code. 2021-06-17 14:26:12 +08:00
Hao Sun 69bfc9917f * task #38754, bug #11135, support for adding child step for group automatically. 2021-06-17 11:41:32 +08:00
hufangzhou b09234b272 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 17:26:06 +08:00
hufangzhou 0dd6c819a9 * Adjust the code. 2021-06-16 17:26:01 +08:00
tianshujie98 afa6c54f93 * Adjust code. 2021-06-16 17:14:31 +08:00
hufangzhou 69538f2cb7 * Adjust the source select control width in batch create page. 2021-06-16 17:12:25 +08:00
holan20180123 1867f60ff5 * Adjust story view. 2021-06-16 16:28:43 +08:00
holan20180123 51cf208621 * Adjust batch edit story. 2021-06-16 15:37:06 +08:00
hufangzhou 387899f28e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 15:05:21 +08:00
hufangzhou 8a5d9c8bb5 * Adjust the code. 2021-06-16 15:05:18 +08:00
tianshujie98 420a526d54 * Adjust code. 2021-06-16 14:08:34 +08:00
tianshujie98 08d176663e * Fix dynamic issues. 2021-06-16 13:45:40 +08:00