 孙广明
|
7f6a737d82
|
* Fix details.
|
2022-01-26 10:26:52 +08:00 |
|
|
孙广明
|
6cf044da20
|
* Fix details.
|
2022-01-26 10:26:18 +08:00 |
|
|
孙广明
|
967553b646
|
* Fix code details.
|
2022-01-26 10:16:53 +08:00 |
|
|
孙广明
|
2530d27f0b
|
* Fix bug #18972.
|
2022-01-26 10:14:30 +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 |
|
|
李玉春
|
e19ca18d37
|
Merge branch 'devops20_18969' into 'master'
修复bug 18969
See merge request easycorp/zentaopms!1613
|
2022-01-25 09:15:37 +00: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 |
|
|
孙广明
|
d1f12dc1a5
|
Merge branch 'devops20_liyuchun_48094' into 'devops20'
* Fix error.
See merge request easycorp/zentaopms!1611
|
2022-01-25 08:38:42 +00:00 |
|
|
liyuchun
|
e9f36e078b
|
* Add auth.
|
2022-01-25 16:36:43 +08:00 |
|
|
孙广明
|
e797653a34
|
* Finish task #47983.
|
2022-01-25 16:35:42 +08:00 |
|
|
zenggang
|
5f83afb622
|
* Unit test and adjust code
|
2022-01-25 08:33:21 +00:00 |
|
|
liyuchun
|
9e6ad38c52
|
* Fix error.
|
2022-01-25 16:32:49 +08:00 |
|
|
孙广明
|
00a31730c5
|
Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify product plan view problem.
See merge request easycorp/zentaopms!1609
|
2022-01-25 08:32:34 +00:00 |
|
|
hufangzhou
|
7115724593
|
* Fix bug #18958.
|
2022-01-25 16:30:01 +08:00 |
|
|
xieqiyu
|
03936d7b29
|
* Modify product plan view problem.
|
2022-01-25 16:27:51 +08:00 |
|
|
caoyanyi
|
4e1b20e9c8
|
* Adjust code.
|
2022-01-25 08:25:40 +00:00 |
|
|
caoyanyi
|
42c0a2f115
|
* Modify root token check.
|
2022-01-25 08:23:28 +00:00 |
|
|
liumengyi
|
980facb451
|
* Fix bug #18890.
|
2022-01-25 16:20:25 +08:00 |
|
|
孙广明
|
81b210500d
|
Merge branch 'sprint/scx_statistic_lang' into 'master'
*Statistic Lang.
See merge request easycorp/zentaopms!1606
|
2022-01-25 07:54:58 +00:00 |
|
|
孙广明
|
6faf406eb4
|
Merge branch 'sprint/183_zhouxin_18909' into 'master'
fix bug.
See merge request easycorp/zentaopms!1604
|
2022-01-25 07:54:22 +00:00 |
|
|
songchenxuan
|
3fc288c9a6
|
*Statistic Lang.
|
2022-01-25 15:40:44 +08:00 |
|
|
孙广明
|
73f9642ec4
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18952, #18904.
See merge request easycorp/zentaopms!1602
|
2022-01-25 07:03:00 +00:00 |
|
|
孙广明
|
475c854018
|
Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18910,18762.
See merge request easycorp/zentaopms!1603
|
2022-01-25 07:02:06 +00:00 |
|
|
李玉春
|
3e977c6cc6
|
Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify test problem.
See merge request easycorp/zentaopms!1605
|
2022-01-25 07:00:52 +00:00 |
|
|
xieqiyu
|
7feffbdcfa
|
* Modify test problem.
|
2022-01-25 14:57:15 +08:00 |
|
|
tianshujie
|
e8cf4abf9a
|
* Fix bug.
|
2022-01-25 14:51:10 +08:00 |
|
|
zhouxin
|
f79aa8806f
|
fix bug.
|
2022-01-25 06:50:11 +00:00 |
|
|
tianshujie
|
c56ecee795
|
* Fix bug #18910,18762.
|
2022-01-25 14:47:51 +08:00 |
|
|
liumengyi
|
9667299ce4
|
* Fix bug #18952, #18904.
|
2022-01-25 14:41:27 +08:00 |
|
|
孙广明
|
7167046722
|
Merge branch 'sprint/183_hufangzhou_fixbug' into 'master'
* Fix bug #17993.
See merge request easycorp/zentaopms!1586
|
2022-01-25 06:28:02 +00:00 |
|
|
孙广明
|
3c4a40b439
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug#18903.
See merge request easycorp/zentaopms!1600
|
2022-01-25 06:23:45 +00:00 |
|
|
liyuchun
|
3fee6f256d
|
Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20
|
2022-01-25 14:23:15 +08:00 |
|
|
liyuchun
|
2b71ad28de
|
* Finish task #48094.
|
2022-01-25 14:19:24 +08:00 |
|
|
liumengyi
|
b6901081a7
|
* Remove empty line.
|
2022-01-25 14:18:35 +08:00 |
|
|
liumengyi
|
fbeac8b6ca
|
* Fix bug#18903.
|
2022-01-25 14:17:05 +08:00 |
|
|
孙广明
|
5eadae0143
|
Merge branch 'sprint/183_zhouxin_18950' into 'master'
Fix bug.
See merge request easycorp/zentaopms!1599
|
2022-01-25 06:09:12 +00:00 |
|
|
zhouxin
|
2141537a36
|
Fix bug.
|
2022-01-25 06:06:41 +00:00 |
|
|
tianshujie
|
f7d58603fa
|
* Fix bug #18944,18947,18946.
|
2022-01-25 14:05:23 +08:00 |
|
|
孙广明
|
24a4746f8a
|
Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Modify product plan desc.
See merge request easycorp/zentaopms!1597
|
2022-01-25 05:39:37 +00:00 |
|
|
孙广明
|
cac8eaa104
|
Merge branch 'sprint/183_tianshujie_bug' into 'master'
Sprint/183 tianshujie bug
See merge request easycorp/zentaopms!1596
|
2022-01-25 05:38:26 +00:00 |
|