Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,786 Commits 2 Branches 292 Tags
e07d28fd82ee4672dde3a45bfd32d89c2fc2b5e8
Commit Graph
250 Commits
Author SHA1 Message Date
tianshujie 9ef6b56e2c * Fix bug #26994. 2022-09-05 13:07:33 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
tianshujie 6c0c3a3cda * Fix bug #26110. 2022-08-11 09:30:06 +08:00
liugang af464df513 * Finish task #63391. 2022-08-03 16:16:26 +08:00
daitingting b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
mayue 6f9cfb66f1 * Fix bug #24706. 2022-07-14 15:13:51 +08:00
mayue bde2111b6a * Fix bug #24706. 2022-07-14 11:25:42 +08:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205' 
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
 2022-06-22 09:21:12 +00:00
王怡栋 83ecf656d3 Merge branch 'sgm_parentplan' into 'master' 
* Code for feedback #397.

See merge request easycorp/zentaopms!4033

(cherry picked from commit beaddb012c)

f0c23584 * Code for feedback #397.
 2022-06-21 06:28:13 +00:00
王怡栋 c30ba304ab Revert "Merge branch 'sgm_parentplan' into 'master'" 
This reverts merge request !4033
 2022-06-21 06:25:45 +00:00
孙广明 f0c23584e0 * Code for feedback #397. 2022-06-21 10:23:58 +08:00
zhouxudong f8792b01bf * Finish task #57871. 2022-06-21 00:42:05 +00:00
zhouxudong 64310b7dfb * Finish task #57871. 2022-06-20 08:17:44 +00:00
zhouxudong e2d00ec066 * Finish task #57880 #57881 #57866. 2022-06-20 08:11:52 +00:00
zhouxudong 32c34c35e9 * Finish task #57880 #57881 #57866. 2022-06-20 07:43:08 +00:00
zhouxudong 19d289455a * Finish task #57880 #57881 #57866. 2022-06-20 06:34:29 +00:00
liumengyi 1daf6e8f91 * Add annotation. 2022-06-08 17:02:44 +08:00
liumengyi e834782533 * Fix bug of task #56455. 2022-06-08 16:54:01 +08:00
liumengyi bb2ab1cf7b * Finish task #56455. 2022-06-08 15:05:47 +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
mayue 21402a6f66 * Finish task #55171. 2022-05-24 08:12:28 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
mayue 8a1fdfe0d8 Fix bug #22756. 2022-05-20 09:29:39 +00:00
wangyidong 3b7aa9ed80 * fix bug. 2022-05-20 17:07:55 +08:00
wangyidong 17d1e3301b * code for #54801. 2022-05-20 15:54:35 +08:00
daitingting 00ebebb6ed * Check privilege by buildMenu. 2022-05-20 07:38:22 +00:00
leiyong 59a3d51ee6 * Finish task#54490. 2022-05-20 02:47:24 +00:00
mayue 08588cc445 * Optimize code. 2022-05-19 07:52:24 +00:00
mayue 8e415b38cb * Fix bug #22639. 2022-05-19 07:45:02 +00:00
mayue 0e0aed22f1 * Fix bug #22639. 2022-05-19 03:26:18 +00:00
liumengyi ff4e5ba635 * Fix bug for task#54350. 2022-05-19 10:24:14 +08:00
liumengyi b8c091aa27 * Finish task #54350. 2022-05-18 15:17:51 +08:00
daitingting 244f061700 * Build flow menu. 2022-05-17 09:14:29 +00:00
wangyuting2 f5638d6481 * Fix buildOperateMenu bug. 2022-05-17 16:56:25 +08:00
mayue be47bb739c * Finish task #54191. 2022-05-17 07:06:36 +00:00
tianshujie 2ee1ea4b7a * Modifying judgment logic. 2022-05-17 10:36:41 +08:00
tianshujie 4bd3e1ba3e * Finish task #54353. 2022-05-17 09:21:23 +08:00
daitingting da18989aa2 * Remove testin codes. 2022-05-12 05:55:14 +00:00
daitingting e99212a7bc * Check execution privilege in buildOperateMenu function. 2022-05-12 05:52:16 +00:00
daitingting 8243e4c175 * Remove empty line. 2022-05-11 01:47:55 +00:00
daitingting 0fba3427af * Build operate menu for productplan module. 2022-05-11 01:39:53 +00:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
孙华伟 dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
mayue 21a7e2bac1 * Fix bug #21579. 2022-04-07 16:50:03 +08:00
tianshujie 5e7034e5c1 * Fix bug #20653. 2022-03-23 14:11:25 +08:00
tianshujie 27ee0c1d3d * Fix bug #20918. 2022-03-22 15:15:04 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00