Commit Graph
633 Commits
Author SHA1 Message Date
zhouxudong 60ddcc7894 * Finish task #59518 #59522. 2022-07-05 05:49:04 +00:00
liumengyi 16e0011b79 * Fix bug #24651. 2022-07-01 09:43:22 +08:00
tianshujie 5a7778acbe * Fixed TAB return error. 2022-06-30 13:37:34 +08:00
王怡栋 19f69fa354 Merge branch 'sprint/208_liumengyi_686' into 'master'
* Fix issue #686.

See merge request easycorp/zentaopms!4208
2022-06-29 05:35:33 +00:00
liumengyi 6669ccb37a * Fix issue #686. 2022-06-29 13:34:09 +08:00
sunjun d0bfee6d69 fixbug_24438 2022-06-29 05:11:49 +00:00
tianshujie f994051ea8 * Finish task #58552. 2022-06-28 12:16:11 +08:00
tianshujie 319d29e3d3 * Finish task #58552. 2022-06-28 09:06:38 +08:00
tianshujie 70b01098ac * Finish task #58552. 2022-06-27 17:22:49 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
孙广明 7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +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
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
liumengyi 78bd314db5 * Fix bug #13255. 2022-04-24 15:50:21 +08:00
mayue 2ed8646488 * Fix bug #21948. 2022-04-24 09:31:14 +08:00
孙华伟 05a4805660 *Fix bug#20272. 2022-04-01 11:27:47 +08:00
tianshujie 7d4897aa8f * Fix bug #16633. 2022-03-30 16:34:58 +08:00
孙华伟 b01120b6a3 *Fix bug#21183. 2022-03-30 14:42:47 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08: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 74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
xieqiyu 09f4270792 * Modify the module of test case when change product type. 2022-02-25 13:10:54 +08:00
zhengrunyu c9f2aa8d5c *Delete null. 2022-02-23 09:36:51 +08:00
zhengrunyu 0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
hufangzhou 64f8980289 * Fix bug #19506. 2022-02-14 13:57:52 +08:00
liumengyi 6613dc493f * Finish task #47092. 2022-01-06 15:29:45 +08:00
xieqiyu 5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
hufangzhou 05d9182e31 * Fix bug #17116, bug #17117. 2021-12-06 12:09:15 +08:00
tianshujie 7498352698 * Fix bug #16789. 2021-12-01 13:13:21 +08:00
songchenxuan a8b2009bad * Finish task #45019. 2021-11-30 14:00:37 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie f2b60bda9e * Finish task #45011. 2021-11-27 19:17:38 +08:00
mayue 0a3c124b20 * Fix bug #16640. 2021-11-26 13:34:17 +08:00
xieqiyu 0669e7385b * Fix bug#16519. 2021-11-22 12:33:27 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
root 02c2f5e2e2 * Fix bug #15689 2021-11-03 15:45:26 +08:00
tianshujie 67dfccb01c * Fix bug #14776. 2021-09-01 09:31:55 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
王怡栋 7b12c9ca2b * adjust for concat sign for build url. 2021-08-30 14:19:41 +08:00
tianshujie e60c95725e * Modify the test module to return the link problem. 2021-08-30 13:23:07 +08:00
liyuchun d694419e52 * Code for task #41764. 2021-08-30 11:01:10 +08:00
tianshujie 5f740be96b * Modify the test case back link problem. 2021-08-27 15:24:32 +08:00
tianshujie98 f8074fdafb * Finish task #41800. 2021-08-25 10:45:33 +08:00
王怡栋 808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
zenggang ce9ba610a2 * Finish task #41487 2021-08-18 15:20:14 +08:00
tianshujie98 751900edf9 * Finish task #41215. 2021-08-10 11:31:15 +08:00
Yagami 7c6fb70deb * Finish task #40905. 2021-08-06 13:51:24 +08:00