Commit Graph
123 Commits
Author SHA1 Message Date
liumengyi e454aa2757 * Fix bug #17768. 2021-12-22 14:26:22 +08:00
李玉春 84f2cfb102 Merge branch 'sgm_fixbug' into 'master'
* Finish task #46161.

See merge request easycorp/zentaopms!1059
2021-12-22 02:53:35 +00:00
zhengrunyu b5b1fb4d81 *card name warp. 2021-12-22 10:47:29 +08:00
孙广明 08c7f0cc50 * Finish task #46161. 2021-12-22 10:31:43 +08:00
liumengyi 6b7cbc74ab * Fix bug #17724, #17769, #17768, #17765, #17763, #17737. 2021-12-21 17:16:46 +08:00
孙广明 4de57a92d2 Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.

See merge request easycorp/zentaopms!1030
2021-12-21 05:56:06 +00:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
tianshujie 8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
孙广明 9aa2fc86c0 * Fix card title style. 2021-12-20 16:41:30 +08:00
孙广明 08758239f9 * Fix kanban style. 2021-12-20 15:47:47 +08:00
孙广明 428ba360dd * Fix kanban css. 2021-12-20 15:40:02 +08:00
孙广明 a24a6918e1 * Fix kanban style. 2021-12-20 14:27:07 +08:00
孙广明 177c9b158f Merge branch 'sprint/179_tianshujie_46151' into 'kanban'
Sprint/179 tianshujie 46151

See merge request easycorp/zentaopms!991
2021-12-20 02:41:05 +00:00
孙广明 1c61b2a759 Merge branch 'kanban' into 'sprint/179_liumengyi_46158'
# Conflicts:
#   module/kanban/js/view.js
2021-12-20 00:53:10 +00:00
liumengyi 7d3ad08bc6 * Finish task #46158, and fix bug #17657,#17655. 2021-12-17 15:39:41 +08:00
tianshujie 2628b1c33f * Finish task #46151. 2021-12-17 15:11:26 +08:00
zhengrunyu 0e5b54464c *Finish task. 2021-12-17 13:18:10 +08:00
zhengrunyu 80ca6c5585 *Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task. 2021-12-17 08:54:46 +08:00
孙广明 ecd813ee37 * Fix card bug. 2021-12-15 17:10:00 +08:00
孙广明 610d12a632 * Code for card info. 2021-12-15 10:10:20 +08:00
孙广明 8d77f8599b * Code for card. 2021-12-14 14:43:48 +08:00
孙广明 ad53ead5ba * Fix code details. 2021-12-09 14:33:23 +08:00
孙广明 9824f4c6ac * Code for task #45818. 2021-12-09 14:11:49 +08:00