 孙广明
|
202df229b0
|
* Code for force upgrade.
|
2022-03-04 09:42:19 +08:00 |
|
|
孙广明
|
c5f19a1179
|
Merge branch 'sprint/186_liumengyi_20255' into 'master'
* Fix bug #20255.
See merge request easycorp/zentaopms!2067
|
2022-03-04 01:15:48 +00:00 |
|
|
liumengyi
|
65fc1b9ca9
|
* Fix bug #20255.
|
2022-03-04 09:08:54 +08:00 |
|
|
王怡栋
|
21e6b61e91
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20010,19904
See merge request easycorp/zentaopms!2062
|
2022-03-04 00:53:35 +00:00 |
|
|
Zongjun Lan
|
3d9d1c7bc2
|
* remove file
|
2022-03-04 08:49:17 +08:00 |
|
|
Zongjun Lan
|
9f15d5cfdb
|
* code format
|
2022-03-04 08:48:20 +08:00 |
|
|
Zongjun Lan
|
76b6c421ab
|
* code format
|
2022-03-04 08:46:52 +08:00 |
|
|
zhujinyong
|
732a6d8891
|
* Fix bug: declare function of ext model.
|
2022-03-04 08:46:41 +08:00 |
|
|
zhujinyong
|
f25b9b44ce
|
* Remove ext model of same filename.
|
2022-03-03 22:58:39 +08:00 |
|
|
孙广明
|
f7eda190e8
|
Merge branch 'sprint/186_tianshujie_20300' into 'master'
* Fix bug #20300.
See merge request easycorp/zentaopms!2064
|
2022-03-03 09:16:21 +00:00 |
|
|
孙广明
|
d76d38b7c2
|
Merge branch 'sprint/sunhao/bug20280' into 'master'
* Bug #20280, fix avatar with text not displayed as expected.
See merge request easycorp/zentaopms!2059
|
2022-03-03 09:15:25 +00:00 |
|
|
tianshujie
|
75ba14eb95
|
* Fix bug #20298.
|
2022-03-03 17:05:35 +08:00 |
|
|
tianshujie
|
3246d38e73
|
* Fix bug #20300.
|
2022-03-03 16:50:52 +08:00 |
|
|
孙广明
|
2e5fee711a
|
Merge branch 'sprint/186_liumengyi_20302' into 'master'
* Fix bug #20131.
See merge request easycorp/zentaopms!2063
|
2022-03-03 08:43:22 +00:00 |
|
|
liumengyi
|
54d4ea2fc6
|
* Fix bug #20131.
|
2022-03-03 16:40:29 +08:00 |
|
|
王怡栋
|
902d11d8df
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-03 16:11:31 +08:00 |
|
|
王怡栋
|
9acdcb0abf
|
* adjust for check flow require field.
|
2022-03-03 16:11:10 +08:00 |
|
|
孙广明
|
30d0d41eab
|
Merge branch 'sprint/fix_bug_leiyong' into 'master'
* Determines whether to process indexes when upgrading.
See merge request easycorp/zentaopms!2061
|
2022-03-03 07:59:43 +00:00 |
|
|
孙广明
|
9a84208d61
|
Merge branch 'sprint/186_liumengyi_20302' into 'master'
* Fix bug #20302.
See merge request easycorp/zentaopms!2060
|
2022-03-03 07:58:55 +00:00 |
|
|
Zongjun Lan
|
b4695acd3a
|
* fix bug 20010,19904
|
2022-03-03 15:55:48 +08:00 |
|
|
leiyong
|
e9b4765a49
|
* Determines whether to process indexes when upgrading.
|
2022-03-03 15:48:36 +08:00 |
|
|
liumengyi
|
fed5f3cb4e
|
* Fix bug #20302.
|
2022-03-03 15:46:05 +08:00 |
|
|
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 |
|