Commit Graph
838 Commits
Author SHA1 Message Date
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
Lufei 3e69145e58 * Support task restart api. 2022-11-07 15:31:18 +08:00
Yagami d35791bde0 * Fix keep login bug. 2022-11-07 10:54:15 +08:00
朱金勇 8fff18a3ea Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.

See merge request easycorp/zentaopms!6025
2022-11-04 02:51:21 +00:00
鲁飞 95d10ea6d3 * Fix call api error. 2022-11-04 02:51:20 +00:00
hufangzhou 50934a34eb * Change the zentao manual url. 2022-11-03 07:01:02 +00:00
孙广明 acf5a57b8f Merge branch 'sprint/254_tianshujie_kanban' into 'master'
Sprint/254 tianshujie kanban

See merge request easycorp/zentaopms!5991
2022-11-02 07:53:05 +00:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
宋辰轩 c0ef49273f * Add db and define to 17-7 2022-11-01 13:30:03 +08:00
孙广明 020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
tanghucheng 6c063505d6 Merge branch 'master' into tanghucheng_feedback_module 2022-10-18 15:33:45 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
mayue 811285c53f Merge branch 'biz13_mayue_task#71837' into sprint/zentaobiz12_ticket 2022-10-14 14:45:17 +08:00
mayue 6b517a3b8e * Finish task #71837. 2022-10-14 14:27:57 +08:00
lanzongjun 6fdafa63bb showimport whitelist 2022-10-11 13:28:24 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
wangzemei e38d934cbd * extract common variable for kanban colWidth 2022-09-29 12:20:54 +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
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
zenggang d1c02c34c0 * Adjust code 2022-09-08 07:24:42 +00:00
hufangzhou 55ce88445b * Add the new version. 2022-09-08 15:17:06 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
sunguangming e4dd6f0356 * Add openmethod. 2022-08-26 16:06:45 +08:00
王怡栋 de8934a593 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add import white list

See merge request easycorp/zentaopms!5109
2022-08-25 03:20:27 +00:00
lanzongjun b964b5e17a * add import white list 2022-08-25 10:20:05 +08:00
hufangzhou e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
tianshujie 15eface39c * Finish task #65808. 2022-08-23 15:40:29 +08:00
caoyanyi 8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
zhujinyong 7e67e54fe9 * Define table. 2022-08-15 11:10:09 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
tanghucheng 36b07367c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-08 12:07:23 +08:00
王怡栋 ec328f7432 Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
#   config/zentaopms.php
2022-08-08 03:05:17 +00:00
tanghucheng 28f896e84c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 08:11:14 +08:00
dongli bcd6fd0c0f * Finish task #62948 2022-08-04 06:10:02 +00:00
liyuchun 146262ad36 * Add pipeline type. 2022-08-03 05:18:37 +00:00
hufangzhou 48f500e5a8 * Code for task #62951. 2022-08-03 09:37:36 +08:00
liyuchun f3044011d8 * Finish task #62870. 2022-08-01 05:58:24 +00:00
tanghucheng cb6339024e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-27 17:17:39 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00