 王怡栋
|
262cdf3eef
|
Merge branch 'sprint/fixbug_hufangzhou_15647' into 'master'
* Fix bug #15647.
See merge request easycorp/zentaopms!2779
|
2022-04-07 08:14:15 +00:00 |
|
|
王怡栋
|
ada2189c25
|
Merge branch 'sprint/fixbug_hufangzhou_15608' into 'master'
* Fix bug #15608.
See merge request easycorp/zentaopms!2798
|
2022-04-07 08:01:28 +00:00 |
|
|
王怡栋
|
d2f81a38b7
|
Merge branch 'sprint/fixbug_hufangzhou_16204' into 'master'
* Fix bug #16204.
See merge request easycorp/zentaopms!2797
|
2022-04-07 08:00:58 +00:00 |
|
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
|
hufangzhou
|
32da4b3b25
|
* Fix bug #16204.
|
2022-04-07 15:54:06 +08:00 |
|
|
孙广明
|
cad1bd8c6e
|
Merge branch 'autotest_ly' into 'master'
Autotest ly
See merge request easycorp/zentaopms!2795
|
2022-04-07 07:32:40 +00:00 |
|
|
liyang
|
f711ec0c55
|
Merge branch 'autotest_ly' of https://gitlab.zcorp.cc/easycorp/zentaopms into autotest_ly
|
2022-04-07 15:30:29 +08:00 |
|
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
|
liyang
|
19af348c3c
|
add case data
|
2022-04-07 15:27:45 +08:00 |
|
|
王怡栋
|
14e892f6ab
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-07 15:06:23 +08:00 |
|
|
王怡栋
|
a5e6f2ca15
|
* fix bug #20885.
|
2022-04-07 15:05:39 +08:00 |
|
|
孙广明
|
65132d2517
|
Merge branch 'master_xieqiyu_21552' into 'master'
* Fix bug#21552.
See merge request easycorp/zentaopms!2789
|
2022-04-07 06:42:19 +00:00 |
|
|
孙广明
|
55832ef09f
|
Merge branch 'master_xieqiyu_21468' into 'master'
* Fix bug#21468.
See merge request easycorp/zentaopms!2787
|
2022-04-07 06:41:25 +00:00 |
|
|
孙广明
|
6c7711949e
|
Merge branch 'sprint/fixbug_hufangzhou_21525' into 'master'
* Fix bug #21525.
See merge request easycorp/zentaopms!2792
|
2022-04-07 06:40:20 +00:00 |
|
|
孙广明
|
dd043d3bda
|
Merge branch 'autotest_ly'
|
2022-04-07 14:37:24 +08:00 |
|
|
孙广明
|
18a269ea60
|
Merge branch 'master' into 'autotest_ly'
# Conflicts:
# test/data/zentao/processor.php
|
2022-04-07 06:36:06 +00:00 |
|
|
liyang
|
a03d2d52d2
|
add design test
|
2022-04-07 14:33:10 +08:00 |
|
|
hufangzhou
|
fe7158cf3a
|
* Fix bug #21525.
|
2022-04-07 14:32:44 +08:00 |
|
|
李玉春
|
5a9dd5095b
|
Merge branch 'fixbug_sunjun_16397' into 'master'
*Fixbug_sunjun_16397
See merge request easycorp/zentaopms!2791
|
2022-04-07 06:31:07 +00:00 |
|
|
李玉春
|
29941e73f7
|
Merge branch 'sprint/tianshujie_bug21159' into 'master'
* Fix bug #21159.
See merge request easycorp/zentaopms!2790
|
2022-04-07 06:17:30 +00:00 |
|
|
tianshujie
|
f4fd8bbf37
|
* Fix bug #21159.
|
2022-04-07 14:13:24 +08:00 |
|
|
sunjun
|
6b40ab7df0
|
*Fixbug_sunjun_16397
|
2022-04-07 14:09:51 +08:00 |
|
|
xieqiyu
|
d6ab24caff
|
* Fix bug#21552.
|
2022-04-07 13:53:41 +08:00 |
|
|
Hao Sun
|
c36bee8ff0
|
* bug #13567, support to fit content width for priority label.
|
2022-04-07 13:49:24 +08:00 |
|
|
李玉春
|
9a23e30c7a
|
Merge branch 'devops25_51075' into 'master'
Fix bug#19960
See merge request easycorp/zentaopms!2788
|
2022-04-07 05:14:55 +00:00 |
|
|
李玉春
|
f53dbe81d9
|
Merge branch 'fixbugs_zhouxin_20718' into 'master'
* Fix bug #20718.
See merge request easycorp/zentaopms!2784
|
2022-04-07 05:05:55 +00:00 |
|
|
zenggang
|
691cde081b
|
* Fix bug#19960
|
2022-04-07 03:32:14 +00:00 |
|
|
xieqiyu
|
7892d031e4
|
* Fix bug#21468.
|
2022-04-07 11:18:58 +08:00 |
|
|
孙广明
|
c286e44d55
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.
See merge request easycorp/zentaopms!2773
|
2022-04-07 02:44:02 +00:00 |
|
|
zhouxin
|
9400811bae
|
* Adjust code.
|
2022-04-07 02:40:23 +00:00 |
|
|
李玉春
|
6d9a40f24d
|
Merge branch 'devops25_zenggang' into 'master'
Fix bug#20886,16610
See merge request easycorp/zentaopms!2783
|
2022-04-07 02:39:56 +00:00 |
|
|
李玉春
|
efe4dedfd8
|
Merge branch 'fixbug_sunjun_17344' into 'master'
Fixbug sunjun 17344
See merge request easycorp/zentaopms!2785
|
2022-04-07 02:23:14 +00:00 |
|
|
sunjun
|
bf8c28ebe8
|
*Fixbug_sunjun_17344
|
2022-04-07 10:20:36 +08:00 |
|
|
zenggang
|
2429bc7f6e
|
* Fix bug#20886,16610
|
2022-04-07 01:58:09 +00:00 |
|
|
sunjun
|
aa9ffc738c
|
*Fixbug_sunjun_17344
|
2022-04-07 09:56:55 +08:00 |
|
|
朱金勇
|
c971b37e71
|
Merge branch 'sprint/sunhao/radio_radius_firefox' into 'master'
* fix radio outline radius in firefox on focus.
See merge request easycorp/zentaopms!2781
|
2022-04-07 01:49:45 +00:00 |
|
|
朱金勇
|
1467a0d9e5
|
Merge branch 'sprint/autoTest_liumengyi_action' into 'master'
* Add auto test of aciton.
See merge request easycorp/zentaopms!2782
|
2022-04-07 01:49:35 +00:00 |
|
|
liumengyi
|
1437c024f2
|
* Remove code.
|
2022-04-07 09:44:23 +08:00 |
|
|
zhouxin
|
67f18ddd69
|
* Fix bug #20718.
|
2022-04-07 01:44:12 +00:00 |
|
|
李玉春
|
6fdf05ad71
|
Merge branch 'sprint/sunhao/table_dorpdown_position' into 'master'
fix z-index conflict with pager dropmenu for fixed header in datatable.
See merge request easycorp/zentaopms!2776
|
2022-04-07 01:43:11 +00:00 |
|
|
liumengyi
|
7478c36851
|
* Add auto test of aciton.
|
2022-04-07 09:42:44 +08:00 |
|
|
李玉春
|
9f7d47a686
|
Merge branch 'sprint/sunhao/bug19979' into 'master'
* bug #19979, fix auto focus form control which has errors not work.
See merge request easycorp/zentaopms!2780
|
2022-04-07 01:41:15 +00:00 |
|
|
李玉春
|
708a40ead4
|
Merge branch 'sprint/tianshujie_bug19813' into 'master'
* Fix bug #19813.
See merge request easycorp/zentaopms!2761
|
2022-04-07 01:40:48 +00:00 |
|
|
sunjun
|
e64527e7a0
|
*Fixbug_sunjun_17344
|
2022-04-07 09:25:13 +08:00 |
|
|
liyuchun
|
3804046bdb
|
* Fix bug #21182.
|
2022-04-07 09:15:35 +08:00 |
|
|
Hao Sun
|
40c61e88df
|
* fix radio outline radius in firefox on focus.
|
2022-04-07 08:50:30 +08:00 |
|
|
孙广明
|
14bd6bc03b
|
Merge branch 'sprint/autoTest_liumengyi_action' into 'master'
* Add auto test of action.
See merge request easycorp/zentaopms!2777
|
2022-04-07 00:22:17 +00: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 |
|
|
Hao Sun
|
7d093341c0
|
* bug #19979, fix auto focus form control which has errors not work.
|
2022-04-06 17:30:31 +08:00 |
|