Commit Graph
1500 Commits
Author SHA1 Message Date
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
Hao Sun 686a81b0b1 * optimize UI for page loading, remove indicator as soon as possible 2022-11-08 03:29:19 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong d6dc22d7e0 * adjust for scroll to selected. 2022-10-26 09:39:05 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
wangzemei 4924866a4e * replace echarts.timeline.js 2022-10-20 13:43:23 +08:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +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
liyuchun 41bddc2893 Merge branch 'master' into zenops_46 2022-10-08 15:22:35 +08:00
wangzemei 48efbc2d95 * optimize the format 2022-10-08 11:02:34 +08:00
wangzemei e30e856ea6 * fix bug 28244 2022-09-30 16:27:11 +08: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
曹延义 0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00
曹延义 bfa7cdbdd7 * Optimize page style. 2022-09-30 13:59:18 +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 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 7569eac0ef * modify kanban 2022-09-28 16:10:00 +08:00
liyuchun bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +08:00
dingyongliang ce4df54d24 * file input support mulitple. 2022-09-14 03:10:19 +00:00
曹延义 2014a4b0ba Merge branch 'master' into zenops_44 2022-09-07 06:51:46 +00:00
wangzemei f2c8790dbb * Fix datatable bug about bug#25515 2022-09-06 05:37:01 +00:00
liyuchun 5f04a8d798 Merge branch 'master' into zenops_44 2022-09-05 09:29:53 +08:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 2e870f698b * Fix bug #27225. 2022-09-02 04:32:07 +00:00
caoyanyi 20d6ee9e10 Merge branch 'master' into zenops_44 2022-08-30 16:39:58 +08:00
guofeilong e23fec4835 * Fix confilct problem 2022-08-30 00:43:41 +00:00
Hao Sun 2a63d83df8 *fix $.createLink missing extra params. 2022-08-29 09:03:13 +00:00
caoyanyi a3cbaafafd Merge branch 'master' into zenops_44 2022-08-26 13:38:13 +08:00
guofeilong 6e79a1c3d2 * picker: update logic in option disableEmptySearch 2022-08-24 09:08:11 +00:00
guofeilong 83cb9a8b81 * update Picker_options: disableEmptySearch do while unremote 2022-08-24 02:15:28 +00:00
caoyanyi 98fe25b85a * Add monaco editor to repo view. 2022-08-22 16:31:58 +08:00
zhujinyong b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
朱金勇 6d82afe4fa Merge branch 'sprint/sunhao/table_overflow_type' into 'master'
* change text overflow style in table.

See merge request easycorp/zentaopms!4787
2022-08-08 09:08:11 +00:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun aca14bafc6 remove ext 2022-08-05 08:50:17 +08:00
Hao Sun bf68fdab37 * change text overflow style in table. 2022-08-04 05:18:31 +00:00