Commit Graph
3982 Commits
Author SHA1 Message Date
zhouxin 0fc5c5cba6 * Fix bug #21934. 2022-04-22 05:14:53 +00:00
Zongjun Lan 2414c6d1dc * fix bug #18934 2022-04-21 16:23:16 +08:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
孙广明 57a39efdea * Fix bug #17618. 2022-04-21 10:17:47 +08:00
Zongjun Lan cc17a999ec * fix code 2022-04-21 09:32:11 +08:00
Zongjun Lan a700b8994c * fix bug *19360 2022-04-20 14:22:55 +08:00
李玉春 dc8063428a Merge branch 'sunhuawei_fixbug_18898' into 'master'
Sunhuawei fixbug 18898

See merge request easycorp/zentaopms!3011
2022-04-19 07:40:38 +00:00
孙华伟 4464536c1f Update control.php 2022-04-19 07:34:10 +00:00
孙华伟 bce4e3267b * Fix bug #18898. 2022-04-19 15:27:58 +08:00
孙华伟 dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
tianshujie c595eaa0d5 * Fix bug #21830. 2022-04-19 10:49:03 +08:00
王怡栋 c068a88b3c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *12982

See merge request easycorp/zentaopms!2983
2022-04-19 00:42:57 +00:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
Zongjun Lan b3c2d454b3 * fix bug *12982 2022-04-18 16:42:57 +08:00
Zongjun Lan 921b3e96ce * fix bug *12982 2022-04-18 14:08:02 +08:00
tianshujie 685a583d99 * Fix bug #17551. 2022-04-18 10:50:50 +08:00
Hao Sun e1a11341c6 * refactor: format. 2022-04-18 10:34:14 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
xieqiyu 778bc369ea * Fix bug#15988. 2022-04-14 15:12:44 +08:00
xieqiyu 15a9c5a9b2 * Fix bug#15988. 2022-04-14 10:17:52 +08:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +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
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00: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
孙华伟 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
zhengrunyu 7d3a91ab39 * Change function name for getBudgetWithUnit. 2022-04-12 09:53:30 +08:00
zhengrunyu fba6ac6a0e * Conversion budget unit. 2022-04-12 08:56:26 +08:00
孙广明 1eb763eb04 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2868
2022-04-11 09:22:54 +00:00
朱金勇 1547d004d7 Merge branch 'app_zry' into 'master'
* Fix api for review story.

See merge request easycorp/zentaopms!2857
2022-04-11 07:29:38 +00:00
zhengrunyu e799829a19 * Fix bug 21553. 2022-04-11 15:24:42 +08:00
xieqiyu ff1f998bf7 * Fix bug#19197. 2022-04-11 13:24:35 +08:00
朱金勇 a56b1a77c9 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2813
2022-04-08 06:06:55 +00:00
朱金勇 0c23ddd5f7 Merge branch 'sprint/sunhao/bug16555' into 'master'
* bug #16555, remove scrollbar when drag item to outside of kanban.

See merge request easycorp/zentaopms!2799
2022-04-08 06:06:13 +00:00
Hao Sun 281ad7e876 * fix search and redirect in ajax dropmenu not work as expected sometimes. 2022-04-08 11:43:35 +08:00
Hao Sun 8b336e8694 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:06:46 +08:00
Hao Sun 8b58e71667 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:05:54 +08:00
孙广明 a8f6e27359 * Code for project. 2022-04-07 14:36:42 +08:00
tianshujie 2017a13bc8 * Fix bug #14961. 2022-04-07 08:19:04 +08:00
tianshujie 1dc225aecf Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug19813 2022-04-07 08:14:08 +08:00
朱金勇 ecbbc59166 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2775
2022-04-06 09:09:27 +00:00
zenggang 790932d79d * Fix bug#20909 2022-04-06 08:43:29 +00:00
孙广明 bd895ca244 * Add project test and fix bug. 2022-04-06 16:01:06 +08:00
tianshujie 8aa61bfc0e * Fix bug #14961. 2022-04-06 13:31:56 +08:00
王怡栋 4f5529867b * code for bug #20933. 2022-04-06 13:13:29 +08:00
王怡栋 3f74884813 * fix bug #21411. 2022-04-02 15:53:38 +08:00