Commit Graph
3096 Commits
Author SHA1 Message Date
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
dingyongliang 7b24f667aa * task #72367, fix modal style. 2022-10-18 02:53:44 +00:00
曹延义 8f99d8e1b3 * Modify dividing line style. 2022-10-14 08:44:14 +08:00
李玉春 1b90b9c82c Merge branch 'sprint/247_wzm_important' into 'master'
* fix bug 28395  && change important theme color

See merge request easycorp/zentaopms!5731
2022-10-13 00:53:30 +00:00
wangzemei da15610004 * rebuild green 2022-10-11 16:49:49 +08:00
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +08:00
tianshujie c0377d939a * Fix bug #28476. 2022-10-11 16:22:13 +08:00
wangzemei 4c26cec1f6 * change important theme color 2022-10-11 15:29:24 +08:00
wangzemei d9c4eddb1e * fix bug28304 2022-10-11 14:41:59 +08:00
wangzemei 740e144707 * fix bug 28388 && 28395 2022-10-11 14:05:33 +08:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 aeb4bef5bc * Modify execution page style. 2022-10-10 10:33:40 +08:00
wangzemei c5c38c98bf * modify style cover 2022-10-09 15:18:39 +08:00
wangzemei 3f067a412e * remove empty lines 2022-10-09 09:47:10 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
wangzemei 8f02d62c13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-08 16:56:49 +08:00
李玉春 d38d83d667 Merge branch 'sprint/wangzemei/28244' into 'master'
* fix bug 28244

See merge request easycorp/zentaopms!5664
2022-10-08 03:08:09 +00:00
wangzemei 48efbc2d95 * optimize the format 2022-10-08 11:02:34 +08:00
liyuchun fbb492f4a5 Merge branch 'sprint/244_dyl_70022' 2022-10-08 10:56:08 +08:00
wangzemei e30e856ea6 * fix bug 28244 2022-09-30 16:27:11 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00:00
wangzemei f854b15fe7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-09-30 15:25:35 +08:00
曹延义 bfa7cdbdd7 * Optimize page style. 2022-09-30 13:59:18 +08:00
dingyongliang 8630943125 * update zui. 2022-09-30 05:39:40 +00:00
dingyongliang 6cbce4d471 * fix danger label overlay. 2022-09-30 05:20:38 +00:00
dingyongliang 5867221abe * fix btns overlap. 2022-09-30 05:20:38 +00:00
dingyongliang 359809361a * add limit for btn color. 2022-09-30 05:20:38 +00:00
dingyongliang 768f91b1f5 * task #70022, optimize program style. 2022-09-30 05:20:38 +00:00
wangzemei 44449ba89c * fix #28172 2022-09-30 10:26:51 +08:00
wangzemei 99d8709d93 * fix bug 28217 28220 2022-09-30 10:11:23 +08:00
wangzemei 856061df32 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-09-30 09:41:40 +08:00
wangzemei 6d57c5da04 * Remove blank lines 2022-09-30 09:27:12 +08:00
wangzemei 2bac9d85e0 * add Comments 2022-09-30 09:25:12 +08:00
wangzemei d3ed1bbc4f * add Comments 2022-09-30 09:18:47 +08:00
wangzemei 7c6d631ee8 * fix bug 28215 2022-09-30 09:08:42 +08:00
曹延义 33b215ac39 * Modify unfloder style. 2022-09-29 14:10:00 +08:00
曹延义 859ec3368a * Modify product plan unfloder style. 2022-09-29 14:04:07 +08:00
wangzemei 502aeed83f * add toggle in productPlan 2022-09-29 12:28:22 +08:00
wangzemei e38d934cbd * extract common variable for kanban colWidth 2022-09-29 12:20:54 +08:00
wangzemei 769d447a78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 10:52:29 +08:00
dingyongliang 15c1f99afa * update zui. 2022-09-29 02:19:38 +00:00
曹延义 2160b5efff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 09:18:42 +08:00
李玉春 b7576eedcb Merge branch 'sprint/244' into 'sprint/244_wangzemei_70009'
# Conflicts:
#   www/theme/blue/style.css
#   www/theme/green/style.css
2022-09-29 00:58:03 +00:00
wangzemei 3e05ffd786 * task #70007 2022-09-28 18:10:58 +08:00
wangzemei 1336d2cd18 * rebuild kanban.min.js 2022-09-28 17:00:28 +08:00
wangzemei aef8183bd0 * rebuild theme 2022-09-28 16:51:06 +08:00
wangzemei d78e45c555 * fix table-form 2022-09-28 16:41:52 +08:00
wangzemei f0e61febec Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_70009 2022-09-28 16:34:31 +08:00