Commit Graph

865 Commits

Author SHA1 Message Date
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
王怡栋
4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂
610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
hufangzhou
3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
孙广明
19d93a07d6 * Add ticket api. 2022-12-22 14:30:12 +08:00
hufangzhou
6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
zhouxin
f41dc323bf * Fix filter of base64. 2022-12-07 06:58:26 +00:00
wangyuting
2399c0060b * Fix bug #30202. 2022-11-24 03:09:57 +00:00
zhujinyong
4fe716f2c7 + Add TABLE_SCREEN. 2022-11-22 00:15:00 +08:00
liugang
7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
xieqiyu
930b60756e * Fix bug#29678. 2022-11-18 13:45:38 +08:00
xieqiyu
a2db4e6f77 * Fix bug#29677. 2022-11-18 13:36:33 +08:00
liugang
3171c65b1f * Fix bug #29905. 2022-11-17 09:25:28 +08:00
hufangzhou
3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
liugang
66a85dc546 * Add the dataview table. 2022-11-14 15:26:38 +08:00
wangyuting
3c36bfbb70 * Fix bug #29593. 2022-11-11 01:38:47 +00:00
wangyidong
a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
zhujinyong
a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +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
wangyuting2
0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00: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
wangyuting2
cca2157511 * Set config. 2022-10-27 08:16:39 +00:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +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
wangyuting2
49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +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
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +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
sunguangming
f628589572 * Code for projecr priv. 2022-09-26 14:42:40 +08:00
sunguangming
80430df79d * Finish task #70101. 2022-09-26 14:20:42 +08:00