Commit Graph
33407 Commits
Author SHA1 Message Date
liumengyi dd0ae6c80f * Fix bug #19028, #19030. 2022-01-26 14:19:17 +08:00
liumengyi aba10f0435 * Fix bug #19020. 2022-01-26 13:36:12 +08:00
李玉春 7217d5baea Merge branch 'sgm_fixbug' into 'master'
* Fix en lang for set column width.

See merge request easycorp/zentaopms!1644
2022-01-26 05:25:24 +00:00
孙广明 fbaace7761 Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #19003.

See merge request easycorp/zentaopms!1642
2022-01-26 05:12:38 +00:00
孙广明 12859c9e8d * Fix en lang for set column width. 2022-01-26 13:11:47 +08:00
孙广明 42667ed40b Merge branch 'sprint/183_liumengyi_18999' into 'master'
* Fix bug #18999.

See merge request easycorp/zentaopms!1643
2022-01-26 05:06:53 +00:00
liumengyi 0cade87855 * Fix bug #18999. 2022-01-26 11:59:58 +08:00
孙广明 edf6d49b46 Merge branch 'devops20_liyuchun' into 'master'
* Fix error in mr view.

See merge request easycorp/zentaopms!1640
2022-01-26 03:29:36 +00:00
liyuchun 74a714bd52 * Fix error. 2022-01-26 11:28:20 +08:00
李玉春 687d036e77 Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1641
2022-01-26 03:04:59 +00:00
tianshujie 95ca9fbc52 * Fix bug #19003. 2022-01-26 11:02:48 +08:00
孙广明 5d10caf48f * Fix bug. 2022-01-26 11:02:13 +08:00
李玉春 5e5ccf0e5b Merge branch 'devops_zenggang' into 'master'
zg:合并请求已删除项目展示id

See merge request easycorp/zentaopms!1638
2022-01-26 02:51:30 +00:00
liyuchun b6bf9f253d * Fix error in mr view. 2022-01-26 10:49:57 +08:00
zenggang 7aa6a292d4 * Adjust code for deleted project 2022-01-26 02:47:19 +00:00
孙广明 24e404cde0 Merge branch 'sprint/183_zhouxin_18843' into 'master'
Sprint/183 zhouxin 18843

See merge request easycorp/zentaopms!1636
2022-01-26 02:41:03 +00:00
zhouxin 4284a2331f Change blackButton to btnColor. 2022-01-26 02:40:18 +00:00
李玉春 8bff3489c8 Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.

See merge request easycorp/zentaopms!1633
2022-01-26 02:39:03 +00:00
孙广明 f8a7b87bb8 Merge branch 'sprint/183_liumengyi_18987' into 'master'
* Fix bug #18993.

See merge request easycorp/zentaopms!1634
2022-01-26 02:37:27 +00:00
孙广明 3317e04ce6 Merge branch 'sprint/183_mayue_18961' into 'master'
* Fix bug #18961.

See merge request easycorp/zentaopms!1635
2022-01-26 02:37:02 +00:00
孙广明 7f6a737d82 * Fix details. 2022-01-26 10:26:52 +08:00
孙广明 6cf044da20 * Fix details. 2022-01-26 10:26:18 +08:00
mayue cf8da1955d * Fix bug #18961. 2022-01-26 10:21:28 +08:00
李玉春 4237ad1b7b Merge branch 'devops_caoyanyi' into 'master'
* Modify user bind style.

See merge request easycorp/zentaopms!1632
2022-01-26 02:21:21 +00:00
李玉春 8e0a9247d3 Merge branch 'devops_18978' into 'master'
zg:修复bug18978

See merge request easycorp/zentaopms!1631
2022-01-26 02:21:06 +00:00
孙广明 967553b646 * Fix code details. 2022-01-26 10:16:53 +08:00
liumengyi a596a19a98 * Fix bug #18993. 2022-01-26 10:15:06 +08:00
孙广明 2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +08:00
caoyanyi 03563c3887 * Modify page error. 2022-01-26 02:11:24 +00:00
caoyanyi 0cebd0982e * Modify user bind style. 2022-01-26 02:05:33 +00:00
zenggang 9d35e580eb *Adjust code 2022-01-26 02:03:36 +00:00
zhouxin 2b284939d5 Fix bug #18845. 2022-01-26 01:59:31 +00:00
zenggang ce37bf9985 * Fix bug#18978 2022-01-26 01:58:00 +00:00
孙广明 42238429ce Merge branch 'sprint/183_liumengyi_18987' into 'master'
* Fix bug #18987.

See merge request easycorp/zentaopms!1630
2022-01-26 01:52:14 +00:00
孙广明 24a5707ce3 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Adjust classic mode.

See merge request easycorp/zentaopms!1629
2022-01-26 01:51:47 +00:00
liumengyi e079baf12a * Fix bug #18987. 2022-01-26 09:49:49 +08:00
zhouxin deb452fb01 Fix bug #18843. 2022-01-26 01:49:27 +00:00
孙广明 47eecdcc5a Merge branch 'sprint/183_tianshujie_18808' into 'master'
Fix bug #18808,18893,18558.

See merge request easycorp/zentaopms!1628
2022-01-26 01:48:46 +00:00
xieqiyu 11a69d6206 * Adjust classic mode. 2022-01-26 09:47:01 +08:00
tianshujie c824ae4267 * Fix bug #18893,18808,18558. 2022-01-26 09:45:50 +08:00
tianshujie a9603fe390 * Fix bug #18808. 2022-01-26 09:23:01 +08:00
朱金勇 98c438c2e3 Merge branch 'ztf_zhouxin' into 'master'
add ztf testcases.

See merge request easycorp/zentaopms!1559
2022-01-26 01:15:50 +00:00
朱金勇 3891d5a6cd Merge branch 'ztf_zhouxin_02' into 'master'
Add testcase.

See merge request easycorp/zentaopms!1576
2022-01-26 01:15:35 +00:00
朱金勇 c1d398dff5 Merge branch 'liwenrui_fix_xuan_web_client' into 'master'
* fix xuan web client, do not append web client related stuff if disabled, and use correct login url.

See merge request easycorp/zentaopms!1627
2022-01-26 01:15:17 +00:00
Wenrui LI 82ba5ca80b * fix xuan web client, do not append web client related stuff if disabled, and use correct login url. 2022-01-26 09:11:43 +08:00
孙广明 141a624806 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1621
2022-01-26 01:08:41 +00:00
孙广明 88d6a327c4 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18970.

See merge request easycorp/zentaopms!1626
2022-01-26 01:05:13 +00:00
孙广明 708e5c909c Merge branch 'sprint/183_tianshujie_error' into 'master'
* Fix the problem of error reporting and button dividing line.

See merge request easycorp/zentaopms!1625
2022-01-26 01:04:33 +00:00
孙广明 8dc2be0395 Merge branch 'devops20_liyuchun' into 'master'
* Fix error.

See merge request easycorp/zentaopms!1624
2022-01-26 01:03:15 +00:00
liumengyi d0b9a47318 * Fix bug #18970. 2022-01-26 09:02:54 +08:00