xieqiyu
|
5df559c0dc
|
* Fix bug#18991.
|
2022-01-26 10:34:18 +08:00 |
|
xieqiyu
|
0b9e65b245
|
* Fix bug#18983.
|
2022-01-26 10:27:50 +08:00 |
|
xieqiyu
|
8f843697f2
|
* Fix bug#18989.
|
2022-01-26 10:11:59 +08: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 |
|
孙广明
|
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 |
|
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 |
|
liyuchun
|
a8ca8429ca
|
Merge branch 'sgm_47983'
|
2022-01-25 17:16:17 +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 |
|