Commit Graph
608 Commits
Author SHA1 Message Date
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
朱金勇 1ad5accfce Merge branch 'sprint/sunhao/bug19052' into 'master'
* bug #19052, fix width for some models.

See merge request easycorp/zentaopms!2965
2022-04-18 00:10:55 +00:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
sunjun 3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +08:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.

See merge request easycorp/zentaopms!2894
2022-04-12 07:50:54 +00:00
孙华伟 6c85c8f49c *Beautify the interface. 2022-04-12 15:47:01 +08:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
2022-04-12 06:44:47 +00:00
孙华伟 684196f776 *Optimize the code. 2022-04-12 14:43:05 +08:00
孙华伟 91597abdb7 *Optimize the code. 2022-04-12 14:39:27 +08:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00
Hao Sun 281ad7e876 * fix search and redirect in ajax dropmenu not work as expected sometimes. 2022-04-08 11:43:35 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
朱金勇 33adc0ffbb Merge branch 'sprint/sunhao/bug17170' into 'master'
* bug #17170, support for toggle all children rows on toggle parent row.

See merge request easycorp/zentaopms!2744
2022-04-02 08:23:42 +00:00
Hao Sun f4222d7247 * bug #17170, support for toggle all children rows on toggle parent row. 2022-04-02 16:10:53 +08:00
xieqiyu f9295faec3 * Fix bug#19711. 2022-04-02 15:39:03 +08:00
zhouxudong c0bf8f5275 * Fix bug #21378. 2022-04-02 14:16:09 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
xieqiyu 4542ffb0e2 * Fix bug#19197. 2022-03-31 13:59:38 +08:00
孙广明 e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明 5072b8929b Merge branch 'sprint/master_zhouxudong_18002' into 'master'
Sprint/master zhouxudong 18002

See merge request easycorp/zentaopms!2659
2022-03-31 02:37:33 +00:00
xieqiyu 79d9664263 * Fix bug#18002. 2022-03-30 20:48:33 +08:00
王怡栋 08e3b0e29d Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/execution/model.php
2022-03-30 08:01:18 +00:00
王怡栋 6c078665da Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2636
2022-03-30 08:00:01 +00:00
tianshujie a93dcb0ec7 * Modify the link in the executive board. 2022-03-30 15:55:45 +08:00
tanghucheng 19e6390ed7 * Fix bug #20890. 2022-03-30 15:16:52 +08:00
zhouxudong c7e76c1176 * Fix bug #18270. 2022-03-30 13:05:59 +08:00
xieqiyu f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
zhouxudong 6b9eddc355 * Fix bug #18002. 2022-03-30 09:35:59 +08:00
zhouxudong ecf749b7da * Fix bug #18002. 2022-03-29 16:59:33 +08:00
zhouxudong 3e70b88210 * Fix bug #18270. 2022-03-29 14:49:01 +08:00
tianshujie 7885b87ef3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug16101 2022-03-29 14:30:55 +08:00
zenggang 028833b838 * Fix bug#21092,11398 2022-03-29 06:16:14 +00:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
zhouxin 94c3233d5a * Fix bug #17415. 2022-03-28 00:58:29 +00:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
2022-03-24 07:45:13 +00:00
李玉春 43d834e01d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2513
2022-03-24 07:44:23 +00:00
zhouxudong 3a3660764c * Fix bug. 2022-03-24 15:15:12 +08:00
zhouxudong c6f8ca1526 * Fix bug. 2022-03-24 14:57:46 +08:00
Hao Sun 0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +08:00
zenggang dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
zenggang 04652c0e65 * Adjust code 2022-03-22 07:34:17 +00:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
孙广明 88f1cd03d5 Merge branch 'fixbug_zhouxin_17415' into 'master'
Fix bug #17415.

See merge request easycorp/zentaopms!2436
2022-03-22 06:06:31 +00:00
zhouxin cc2704e1d0 Fix bug #17415. 2022-03-22 05:10:45 +00:00
zhouxudong b65da66453 * Fix bug #14090. 2022-03-22 13:09:47 +08:00
zhouxudong 67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00