Commit Graph
551 Commits
Author SHA1 Message Date
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
chaideqing 69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
zhouxudong c035264e3c * Finish task #60387 #60386 #60383. 2022-07-11 06:43:13 +00:00
zhouxudong 8110d73bd7 * Finish task #59748. 2022-07-05 06:20:33 +00:00
zhouxudong 994ca59405 * Finish task #59748. 2022-07-05 02:50:25 +00:00
leiyong 32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
leiyong 791cc7a40f * Finish task#56926. 2022-06-14 08:54:42 +00: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
liumengyi 5c552b5dff * Fix bug #23271. 2022-06-06 16:34:32 +08:00
liumengyi 2561c857b7 * Fix bug #22800. 2022-05-24 16:14:00 +08:00
mayue 8e415b38cb * Fix bug #22639. 2022-05-19 07:45:02 +00:00
mayue 66c6bf6bc5 * Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639.* Fix bug #22639. 2022-05-19 07:39:46 +00:00
李玉春 579391bd84 Merge branch 'sprint/191_liumengyi_54350' into 'master'
* Finish task #54350.

See merge request easycorp/zentaopms!3506
2022-05-19 03:18:38 +00:00
liumengyi acd0b33267 * Fix bug for task #54350. 2022-05-19 11:05:22 +08:00
mayue d11349b974 * Fix bug #22630. 2022-05-19 01:05:00 +00:00
mayue 117865e63d * Optimize code. 2022-05-18 03:11:12 +00:00
mayue bf4ac6a465 * Fix bug #22574. 2022-05-18 02:48:51 +00:00
mayue be47bb739c * Finish task #54191. 2022-05-17 07:06:36 +00:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
daitingting 0fba3427af * Build operate menu for productplan module. 2022-05-11 01:39:53 +00:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
hufangzhou 6b4822862d * Fix bug #21708. 2022-04-14 10:14:49 +08:00
hufangzhou 1c9afbdbc4 * Fix bug #18296. 2022-04-11 15:54:10 +08:00
孙华伟 fb6de8f7e6 *Optimize the code. 2022-03-22 15:27:36 +08:00
孙华伟 0816a49ce2 *Fix bug#17397 2022-03-22 15:18:08 +08:00
mayue 8f09a4957c Optimize code. 2022-03-21 16:37:56 +08:00
mayue 710805bcb0 Optimize code. 2022-03-21 16:35:54 +08:00
mayue eb54393450 * Fix bug #20808. 2022-03-21 16:26:28 +08:00
zhouxudong c6eb97cc5f * Finish task #49882. 2022-03-07 10:21:57 +08:00
李玉春 fe873b6a53 Merge branch 'sprint/185_zhouxudong_49881' into 'pailei'
* Finish task #49881.

See merge request easycorp/zentaopms!2097
2022-03-07 01:37:43 +00:00
zhouxudong bb3be7d065 * Finish task #49881. 2022-03-07 09:31:22 +08:00
zhouxin 27d109e904 Add kindeditor for the view and close page of productplan. 2022-03-03 02:22:51 +00:00
zhouxin 8722ab62f1 Fix bug. 2022-03-02 03:28:09 +00:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu af76bc5b46 * Append story module when change product type. 2022-02-28 17:50:06 +08:00
zhouxin 5dc91f9a30 Finish task #49886#49883. 2022-02-28 09:14:19 +00:00
xieqiyu d15a0ea9b2 * Modify module of testcase when change product type. 2022-02-24 17:07:54 +08:00
zhouxudong bf002dcd83 * Finish task #49289. 2022-02-23 14:11:38 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhouxin 63be4b0948 Adjust code. 2022-02-22 01:56:44 +00:00
zhouxin ae8d371efb Fix bug. . 2022-02-22 01:12:41 +00:00
zhouxin 751fec28e8 Finish task #49302. 2022-02-21 08:53:25 +00:00
zhengrunyu 0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
zhengrunyu 919ea9d8d0 *Fix bug 18290. 2022-01-11 10:28:33 +08:00
zhengrunyu 412d143578 *Code bug 2022-01-07 09:39:54 +08:00
zhengrunyu 325a57c292 *Code edit and batchedit. 2022-01-07 09:27:39 +08:00