Commit Graph
28478 Commits
Author SHA1 Message Date
tianshujie 95ca9fbc52 * Fix bug #19003. 2022-01-26 11:02:48 +08: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
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
liumengyi a596a19a98 * Fix bug #18993. 2022-01-26 10:15:06 +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
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
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
孙广明 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
liumengyi d0b9a47318 * Fix bug #18970. 2022-01-26 09:02:54 +08:00
tianshujie 8dcd1a0e4c * Fix the problem of error reporting and button dividing line. 2022-01-26 09:02:16 +08:00
liyuchun d95187f42b * Fix error. 2022-01-26 09:01:40 +08:00
李玉春 e0ad5fe9af Merge branch 'devops_caoyanyi' into 'master'
* Modify gitlab group access.

See merge request easycorp/zentaopms!1623
2022-01-26 00:49:07 +00:00
caoyanyi efbb0fa13e * Modify gitlab group access. 2022-01-26 00:46:20 +00:00
孙广明 6884481bc1 Merge branch 'sprint/183_hufangzhou_importLanguage' into 'master'
* Change the import object language items.

See merge request easycorp/zentaopms!1622
2022-01-26 00:35:31 +00:00
孙广明 7f60810003 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18949.

See merge request easycorp/zentaopms!1618
2022-01-26 00:34:16 +00:00
孙广明 5769183328 Merge branch 'sprint/scx_automation' into 'master'
*Automation css.

See merge request easycorp/zentaopms!1617
2022-01-26 00:30:37 +00:00
孙广明 9db830389b Merge branch 'sprint/183_tianshujie_kanban' into 'master'
* Fix kanban style issues.

See merge request easycorp/zentaopms!1620
2022-01-26 00:29:08 +00:00
hufangzhou cf313182f4 * Change the import object language items. 2022-01-25 18:25:05 +08:00
孙广明 560730db3e Merge branch 'sprint/183_hufangzhou_importObject' into 'master'
* Change the import object to plural.

See merge request easycorp/zentaopms!1619
2022-01-25 09:47:07 +00:00
xieqiyu 065bea5ddd * Fix bug#18968. 2022-01-25 17:27:25 +08:00
tianshujie 03d3855aae * Fix kanban style issues. 2022-01-25 17:26:55 +08:00
xieqiyu f2296b64b6 * Fix bug#18964. 2022-01-25 17:21:05 +08:00
xieqiyu c7e52521e3 * Fix bug#18962. 2022-01-25 17:20:19 +08:00
hufangzhou 0d44addd30 * Change the import object to plural. 2022-01-25 17:17:16 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
liumengyi 46a1da1935 * Fix bug #18949. 2022-01-25 17:15:45 +08:00
李玉春 e19ca18d37 Merge branch 'devops20_18969' into 'master'
修复bug 18969

See merge request easycorp/zentaopms!1613
2022-01-25 09:15:37 +00:00
songchenxuan 69f5a4bab6 *Automation css. 2022-01-25 17:14:07 +08:00
孙广明 8207c2b2a7 * Fix code style. 2022-01-25 17:12:39 +08:00
孙广明 287920c08f * Fix bug #18943. 2022-01-25 17:02:23 +08:00
孙广明 d243960742 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18804.

See merge request easycorp/zentaopms!1615
2022-01-25 08:57:58 +00:00
孙广明 bc4d1b14ac Merge branch 'sprint/183_tianshujie_18773' into 'master'
* Fix bug #18773.

See merge request easycorp/zentaopms!1614
2022-01-25 08:57:06 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
liumengyi 1bc4f4c408 * Fix bug #18804. 2022-01-25 16:55:19 +08:00
tianshujie 9550c947ef * Fix bug #18773. 2022-01-25 16:54:37 +08:00
zenggang 7c2443dc66 * Fix bug#18969 2022-01-25 08:53:55 +00:00
李玉春 48146100f6 Merge branch 'devops_zenggang_unit' into 'devops20'
zg:单元测试用例

See merge request easycorp/zentaopms!1612
2022-01-25 08:44:59 +00:00
孙广明 48dc595192 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18890.

See merge request easycorp/zentaopms!1607
2022-01-25 08:44:14 +00:00
liumengyi 644f0fe851 * Fix bug #18890. 2022-01-25 16:43:15 +08:00