 xieqiyu
|
836a35ab82
|
* Code for bug#15504.
|
2021-10-13 17:25:08 +08:00 |
|
|
李玉春
|
89be4c74c7
|
Merge branch '15.6_tianshujie_15484' into '15.6'
* Fix bug #15484.
See merge request easycorp/zentaopms!63
|
2021-10-13 09:23:33 +00:00 |
|
|
liyuchun
|
2330adc576
|
* Adjsut update user view error.
|
2021-10-13 17:16:53 +08:00 |
|
|
liyuchun
|
6359266cf9
|
* Adjust logic of update whitelist when update user view.
|
2021-10-13 16:37:24 +08:00 |
|
|
hufangzhou
|
1de36134f0
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-13 16:16:02 +08:00 |
|
|
hufangzhou
|
1e173e756d
|
* Fix bug #15498.
|
2021-10-13 16:15:57 +08:00 |
|
|
xieqiyu
|
28d62ece60
|
* Fix bug#15501.
|
2021-10-13 16:11:07 +08:00 |
|
|
liyuchun
|
9f36655aea
|
* Finish task #43205.
|
2021-10-13 15:29:53 +08:00 |
|
|
tianshujie
|
880c8893c8
|
* Fix bug #15484.
|
2021-10-13 15:11:26 +08:00 |
|
|
liyuchun
|
5cd7ed9d74
|
* Fix bug #15495.
|
2021-10-13 14:35:09 +08:00 |
|
|
hufangzhou
|
7472470526
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-13 10:51:38 +08:00 |
|
|
hufangzhou
|
e2f51ef422
|
* Fix bug #15270.
|
2021-10-13 10:51:30 +08:00 |
|
|
liyuchun
|
3ddba6aeeb
|
* Fix bug #15479.
|
2021-10-13 10:17:53 +08:00 |
|
|
孙广明
|
315b6352f1
|
Merge branch '15.6_tianshujie_43206' into '15.6'
* Finish task #43206.
See merge request easycorp/zentaopms!54
|
2021-10-13 00:39:33 +00:00 |
|
|
朱金勇
|
a7b043f7b2
|
Merge branch 'sprint/165_zenggang_15439' into '15.6'
Sprint/165 zenggang 15439
See merge request easycorp/zentaopms!52
|
2021-10-12 14:01:00 +00:00 |
|
|
hufangzhou
|
013b6a37cd
|
* Fix bug #15476.
|
2021-10-12 17:36:18 +08:00 |
|
|
hufangzhou
|
5e3863b284
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-12 15:43:02 +08:00 |
|
|
hufangzhou
|
a80eca0ab5
|
* Fix bug #15477.
|
2021-10-12 15:42:58 +08:00 |
|
|
王怡栋
|
edc45687fd
|
* fix error.
|
2021-10-12 14:54:35 +08:00 |
|
|
tianshujie
|
d6cea498cd
|
* Finish task #43206.
|
2021-10-12 10:33:07 +08:00 |
|
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
|
zenggang
|
e7f819ac53
|
* Adjust code variable name
|
2021-10-11 01:16:15 +00:00 |
|
|
zenggang
|
0b7c8943c0
|
* Fix bug#15438
|
2021-10-09 09:11:02 +00:00 |
|
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
|
朱金勇
|
ff09127219
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.
See merge request easycorp/zentaopms!41
|
2021-10-09 01:32:30 +00:00 |
|
|
王怡栋
|
0fa52d3318
|
* adjust for review code.
|
2021-10-09 09:29:10 +08:00 |
|
|
朱金勇
|
85fb57086c
|
Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165'
*Finish task #42867
See merge request easycorp/zentaopms!43
|
2021-10-09 01:21:22 +00:00 |
|
|
zenggang
|
bf16a12c7b
|
* Fix bug#15439
|
2021-10-09 01:05:07 +00:00 |
|
|
tianshujie
|
07bbef9251
|
* Modify language item.
|
2021-10-08 13:58:22 +08:00 |
|
|
tianshujie
|
33ec8312e3
|
* Finish task #42867.
|
2021-10-08 13:50:25 +08:00 |
|
|
王怡栋
|
88a5c5d207
|
* fix loophole.
|
2021-10-08 10:35:38 +08:00 |
|
|
zenggang
|
77a9b33191
|
* Adjust code style
|
2021-10-08 02:27:50 +00:00 |
|
|
zenggang
|
189bc062b3
|
* Fix bug#15363
|
2021-09-30 16:17:48 +08:00 |
|
|
王怡栋
|
a14fc4e7f9
|
* finish task #42848.
|
2021-09-30 15:49:24 +08:00 |
|
|
zenggang
|
cc28a1a037
|
* Fix bug#14382
|
2021-09-30 14:53:36 +08:00 |
|
|
zenggang
|
f139f00e61
|
* Task 42862,previously committed to the master branch, now resubmit to the 165 branch
|
2021-09-30 11:19:05 +08:00 |
|
|
王怡栋
|
ee39f52c2e
|
* finish task #42846.
|
2021-09-29 11:51:17 +08:00 |
|
|
zenggang
|
3efa133827
|
* Fix bug#15278
|
2021-09-29 10:59:27 +08:00 |
|
|
zenggang
|
5d37062ad6
|
* Fix bug#15359
|
2021-09-29 10:46:07 +08:00 |
|
|
朱金勇
|
8ef308be2f
|
Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368
See merge request easycorp/zentaopms!35
|
2021-09-28 08:11:15 +00:00 |
|
|
zenggang
|
d4ddac562d
|
* Add code annotation
|
2021-09-28 15:56:43 +08:00 |
|
|
朱金勇
|
d31182c9f0
|
Merge branch 'sprint/165_sunguangming' into 'sprint/165'
* Fix bug #15335.
See merge request easycorp/zentaopms!33
|
2021-09-28 07:49:28 +00:00 |
|
|
朱金勇
|
79a020c0f5
|
Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.
See merge request easycorp/zentaopms!36
|
2021-09-28 07:46:19 +00:00 |
|
|
朱金勇
|
98f93d563d
|
Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165'
* Finish task #42867.
See merge request easycorp/zentaopms!28
|
2021-09-28 07:42:48 +00:00 |
|
|
tianshujie
|
353bef2e83
|
* Finish task #42867.
|
2021-09-28 15:38:34 +08:00 |
|
|
朱金勇
|
aa86fdea50
|
Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.
See merge request easycorp/zentaopms!38
|
2021-09-28 07:37:30 +00:00 |
|
|
朱金勇
|
fa879ae303
|
Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.
See merge request easycorp/zentaopms!39
|
2021-09-28 07:35:23 +00:00 |
|
|
朱金勇
|
1173e8b65d
|
Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong
See merge request easycorp/zentaopms!37
|
2021-09-28 07:31:10 +00:00 |
|
|
tianshujie
|
4f977efaeb
|
* Finish task #42854.
|
2021-09-28 13:14:32 +08:00 |
|
|
liyuchun
|
9b5a28392b
|
* Finish task #42854.
|
2021-09-28 12:31:59 +08:00 |
|