 Hao Sun
|
97293856bb
|
* Bug #20280, fix avatar with text not displayed as expected.
|
2022-03-03 15:10:25 +08:00 |
|
|
孙广明
|
af52c74832
|
Merge branch 'sprint/186_liumengyi_20293' into 'master'
* Fix bug #20290.
See merge request easycorp/zentaopms!2058
|
2022-03-03 06:55:22 +00:00 |
|
|
liumengyi
|
86d19f82f7
|
* Fix bug #20290.
|
2022-03-03 14:53:58 +08:00 |
|
|
王怡栋
|
aa83dc4428
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20029,19713
See merge request easycorp/zentaopms!2049
|
2022-03-03 06:48:24 +00:00 |
|
|
孙广明
|
a959b65836
|
Merge branch 'sprint/186_tianshujie_20270' into 'master'
* Fix bug #20270.
See merge request easycorp/zentaopms!2057
|
2022-03-03 06:26:52 +00:00 |
|
|
tianshujie
|
794c22298f
|
* Fix bug #20270.
|
2022-03-03 14:22:42 +08:00 |
|
|
Zongjun Lan
|
7312bfe658
|
* rollback code
|
2022-03-03 14:21:44 +08:00 |
|
|
王怡栋
|
6c76f4b11e
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv.
See merge request easycorp/zentaopms!2052
|
2022-03-03 05:22:12 +00:00 |
|
|
王怡栋
|
4c4147b904
|
* fix bug for save summary for backup.
|
2022-03-03 11:03:27 +08:00 |
|
|
王怡栋
|
560eac89d9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-03 10:20:47 +08:00 |
|
|
王怡栋
|
58b1f576bc
|
* fix for api and remove bom and adjust for php8.1.
|
2022-03-03 10:19:58 +08:00 |
|
|
Zongjun Lan
|
c1f97b8d1a
|
* format code
|
2022-03-03 10:18:12 +08:00 |
|
|
孙广明
|
ea2536005e
|
Merge branch 'sprint/186_tianshujie_fixbug' into 'master'
* Remove owt module when upgrading.
See merge request easycorp/zentaopms!2054
|
2022-03-03 02:09:14 +00:00 |
|
|
Zongjun Lan
|
0512526c23
|
* fix bug 19713
|
2022-03-03 10:07:55 +08:00 |
|
|
王怡栋
|
c4229f0d32
|
Merge branch 'sprint/186_hufangzhou_xuanxuan' into 'master'
* Change the owt to conference.
See merge request easycorp/zentaopms!2053
|
2022-03-03 01:56:52 +00:00 |
|
|
hufangzhou
|
4fcbccbaa8
|
* Change the owt to conference.
|
2022-03-03 09:53:14 +08:00 |
|
|
tianshujie
|
081cc7dd17
|
* Remove owt module when upgrading.
|
2022-03-03 09:00:55 +08:00 |
|
|
Zongjun Lan
|
cdf4b29e29
|
* fix bug 20030
|
2022-03-02 18:43:41 +08:00 |
|
|
Zongjun Lan
|
97a174cefe
|
* modify tree config
|
2022-03-02 15:42:55 +08:00 |
|
|
孙广明
|
526a933f47
|
Merge branch 'sprint/186_tianshujie_20245' into 'master'
* Fix bug #20247.
See merge request easycorp/zentaopms!2048
|
2022-03-02 07:16:55 +00:00 |
|
|
tianshujie
|
4f17795ffd
|
* Fix bug #20266.
|
2022-03-02 15:15:37 +08:00 |
|
|
Zongjun Lan
|
5979f32712
|
* fix bug 20029
|
2022-03-02 15:04:12 +08:00 |
|
|
tanghucheng
|
59aaaa4fc0
|
* Fix priv.
|
2022-03-02 15:02:44 +08:00 |
|
|
tianshujie
|
0bb3371484
|
* Fix bug #20245.
|
2022-03-02 14:48:50 +08:00 |
|
|
tianshujie
|
a9f1fcabc2
|
* Fix bug #20247.
|
2022-03-02 14:30:41 +08:00 |
|
|
王怡栋
|
b6cd92a386
|
Merge branch 'sgm_fixbug' into 'master'
* Add upgrade logic.
See merge request easycorp/zentaopms!2047
|
2022-03-02 06:13:26 +00:00 |
|
|
孙广明
|
42624e0427
|
* Add upgrade logic.
|
2022-03-02 14:10:59 +08:00 |
|
|
liyuchun
|
adee975255
|
Merge branch 'sprint/sunhao/task49295'
|
2022-03-02 13:48:36 +08:00 |
|
|
孙广明
|
f01dc2a720
|
Merge branch 'sprint/186_hufangzhou_gantt' into 'master'
* Move the gantt extension file to common/view.
See merge request easycorp/zentaopms!2044
|
2022-03-02 05:32:48 +00:00 |
|
|
hufangzhou
|
59181566ff
|
* Move the gantt extension file to common/view.
|
2022-03-02 13:22:53 +08:00 |
|
|
孙广明
|
3ce145dc36
|
Merge branch 'sprint/186_liumengyi_20142' into 'master'
* Fix bug #20142.
See merge request easycorp/zentaopms!2043
|
2022-03-02 05:20:35 +00:00 |
|
|
liumengyi
|
f1835c9662
|
* Fix bug #20142.
|
2022-03-02 13:19:02 +08:00 |
|
|
王怡栋
|
83ce0b8052
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #20238.
See merge request easycorp/zentaopms!2041
|
2022-03-02 03:19:32 +00:00 |
|
|
王怡栋
|
4e9409ed76
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 11:05:55 +08:00 |
|
|
王怡栋
|
0aa901eb64
|
* fix bug #19908.
|
2022-03-02 11:05:30 +08:00 |
|
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
|
tanghucheng
|
a1dcf760a1
|
* Fix bug.
|
2022-03-02 10:54:50 +08:00 |
|
|
孙广明
|
c3c1351400
|
* Fix bug #20238.
|
2022-03-02 10:53:30 +08:00 |
|
|
王怡栋
|
ff80c70ad1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:35:00 +08:00 |
|
|
王怡栋
|
f71f500755
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:34:40 +08:00 |
|
|
孙广明
|
f7078f64b7
|
Merge branch 'sprint/186_liumengyi_20117' into 'master'
* Fix bug #20117.
See merge request easycorp/zentaopms!2040
|
2022-03-02 02:29:26 +00:00 |
|
|
liumengyi
|
fcc37d1ab0
|
* Fix code for productplan getPairs.
|
2022-03-02 10:28:22 +08:00 |
|
|
liumengyi
|
bf6d9c2e3a
|
* Fix bug #20117.
|
2022-03-02 10:15:38 +08:00 |
|
|
李玉春
|
227db2b158
|
Merge branch 'sprint/186_tianshujie_20228' into 'master'
Sprint/186 tianshujie 20228
See merge request easycorp/zentaopms!2039
|
2022-03-02 02:13:36 +00:00 |
|
|
王怡栋
|
76eea1f5d9
|
* adjust for global create.
|
2022-03-02 10:06:19 +08:00 |
|
|
tianshujie
|
391d9cc18b
|
* Fix bug #20090.
|
2022-03-02 10:02:27 +08:00 |
|
|
tanghucheng
|
8342661162
|
* Add batchCreateCard prvi for lite.
|
2022-03-02 10:01:45 +08:00 |
|
|
王怡栋
|
b7bcd483ab
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20022
See merge request easycorp/zentaopms!2033
|
2022-03-02 01:58:48 +00:00 |
|
|
tianshujie
|
2ef598afcc
|
* Fix the problem of white screen after upgrade.
|
2022-03-02 09:35:34 +08:00 |
|
|
tianshujie
|
1dafa1e8dd
|
* Fix bug #20228.
|
2022-03-02 09:26:39 +08:00 |
|