Commit Graph
158 Commits
Author SHA1 Message Date
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
tianshujie e5bcb8b2f9 * The ID of the last accessed object is retained. 2023-04-13 16:58:25 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
hufangzhou 3c83d94e09 * Merge code. 2023-04-06 09:01:30 +08:00
zhaoke 91af62ac48 Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-04 13:46:52 +08:00
zhaoke 49d18cf72c Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-03 16:46:41 +08:00
tianshujie 978ded6788 * Code for task #89927. 2023-04-03 16:12:48 +08:00
liumengyi d3cf4b54f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-04-03 09:58:23 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
caoyanyi 7616c67a7d * Modify param use cookie. 2023-03-29 09:19:49 +08:00
guofeilong 6750a245a9 * Adjust code for cookie . 2023-03-08 15:42:38 +08:00
guofeilong 432f10f181 * Adjust code for view editManagePriv . 2023-03-08 15:33:10 +08:00
liumengyi 39ed4349e0 * Fix bug #31978. 2023-02-09 10:42:47 +08:00
wangyuting2 2328bcb922 * Fix bug #24872. 2023-02-08 10:15:27 +08:00
孔令茂 df96b3f0b0 * Init fliter project test case. 2023-01-05 08:23:06 +00:00
tanghucheng 24e343dbc3 * Fix bug #31473. 2023-01-05 12:13:22 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
zhouxin f41dc323bf * Fix filter of base64. 2022-12-07 06:58:26 +00:00
caoyanyi 7272593f0b Merge branch 'master' into sprint/220 2022-11-25 13:52:26 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
Yagami d35791bde0 * Fix keep login bug. 2022-11-07 10:54:15 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
曹延义 46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08:00
曹延义 ca5110623e * Add project checkbox style. 2022-09-28 10:09:32 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
sunguangming 80430df79d * Finish task #70101. 2022-09-26 14:20:42 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
liyuchun 1ce5a195c7 * Finish task #62414. 2022-08-01 00:18:02 +00:00
liyuchun b87c8e18aa * Code for task #62414. 2022-07-26 08:42:02 +00:00
tanghucheng 7d351a4c3d * Code for import . 2022-07-14 15:49:52 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
wangyidong 1e7ec30f10 * fix bug for build url in PATH_INFO. 2022-06-22 11:45:26 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
mayue 1965426827 * Finish task #55852. 2022-06-02 13:22:13 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tianshujie 9f3f0bd8c6 * Fix bug #20858. 2022-03-24 16:01:18 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
xieqiyu d2d05a6194 * Fix bug#16112. 2022-03-17 15:56:57 +08:00
王怡栋 55beac7f83 * fix bug #20581. 2022-03-10 16:31:46 +08:00
王怡栋 f5d4dfc9ad * code for task #49356. 2022-03-09 10:53:08 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
liumengyi 9ef522cc46 * Modify code format. 2022-01-19 17:24:15 +08:00