Commit Graph
2996 Commits
Author SHA1 Message Date
wangzemei 1166c0747e * ZUI: remove ellipsis 2022-09-07 00:40:56 +00:00
wangzemei f2c8790dbb * Fix datatable bug about bug#25515 2022-09-06 05:37:01 +00: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
李玉春 e9540f67ae Merge branch 'cyy_67259' into 'master'
* Modify local img.

See merge request easycorp/zentaopms!5203
2022-08-31 06:54:15 +00:00
wangzemei ab36fead98 * update zui css about 26917 2022-08-31 06:33:14 +00:00
wangzemei 2635e0031a * Fix bug #26917 2022-08-31 05:52:20 +00:00
caoyanyi a2bfbcb5af * Modify local img. 2022-08-31 10:38:33 +08:00
caoyanyi 94f2e93d0e * Finish task #67259. 2022-08-31 09:40:04 +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
王怡栋 30eebcede1 Merge branch 'sprint/ZUI_guofeilong_add_icon_blame' into 'master'
* zentaoIcon: add icon-blame

See merge request easycorp/zentaopms!5139
2022-08-26 02:15:45 +00:00
guofeilong 6712743c25 * zentaoIcon: add icon-blame 2022-08-26 02:09:07 +00:00
王怡栋 ecddbde00c Merge branch 'sprint/ZUI_guofeilong_Picker' into 'master'
Sprint/zui guofeilong picker: update options disableEmptySearch

See merge request easycorp/zentaopms!5097
2022-08-25 00:43:10 +00:00
guofeilong 6e79a1c3d2 * picker: update logic in option disableEmptySearch 2022-08-24 09:08:11 +00:00
liumengyi 1c3ca8a460 * Optimize code for bug #26768. 2022-08-24 11:02:25 +08:00
liumengyi e1a022ba7f * Fix bug #26768. 2022-08-24 10:54:29 +08:00
guofeilong 83cb9a8b81 * update Picker_options: disableEmptySearch do while unremote 2022-08-24 02:15:28 +00:00
王怡栋 295c4bf8b7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #65930

See merge request easycorp/zentaopms!5043
2022-08-22 07:23:29 +00:00
liumengyi a54d9168bb * Fix bug for task #64967. 2022-08-22 14:49:04 +08:00
lanzongjun 16ab7ec387 * finish task #65930 2022-08-22 10:29:45 +08:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
guofeilong 04178d6624 * Add zentaoIcon sub-review-user 2022-08-18 02:27:42 +00:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
hufangzhou 6a6b04db11 * Fix bug #26548. 2022-08-16 15:16:19 +08:00
zhujinyong b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
zhujinyong 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
Wenrui LI 2df27f9a12 * fix style of dialogs in zentaoclient. 2022-08-15 08:22:09 +08:00
lanzongjun 47de689c2e remove image 2022-08-11 15:47:48 +08:00
wangyidong 6db44273d2 Merge branch 'sprint224_zg_tasks' 2022-08-10 14:51:59 +08:00
Hao Sun da2fa732bf * fix white-space in table. 2022-08-10 03:08:56 +00:00
guofeilong f7c76765c6 * Fix css bug in td.c-title 2022-08-10 03:04:13 +00:00
zenggang b62d5315ff * Adjust code 2022-08-10 01:35:59 +00:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +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
朱金勇 d14a1dafad Merge branch 'sprint/sunhao/optimize_blue_theme' into 'master'
* update blue theme.

See merge request easycorp/zentaopms!4746
2022-08-08 09:07:57 +00:00
hufangzhou b44ed94231 * Finish task #62965. Fix bug #26130, #26129, #26120. 2022-08-08 16:31:20 +08:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
2022-08-08 03:25:42 +00:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
liumengyi 05f3985def * Fix bug #26033. 2022-08-05 13:15:17 +08:00
liumengyi 54bca1b907 * Fix bug #26033. 2022-08-05 11:01:01 +08:00
lanzongjun aca14bafc6 remove ext 2022-08-05 08:50:17 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
Hao Sun bf68fdab37 * change text overflow style in table. 2022-08-04 05:18:31 +00:00
guofeilong 164e6a99d4 * Fix icon ztf and draft_edit 2022-08-04 01:03:55 +00:00
lanzongjun 245aaf0b14 add dhtmlx 2022-08-02 17:14:33 +08:00
Hao Sun 03bd23492b * update blue theme. 2022-08-02 09:12:17 +00:00
Wenrui LI da9d8249b5 * fix header menu unable to maintain hover state in zentaoclient. 2022-08-02 16:11:00 +08:00