 王怡栋
|
a2ca4f646f
|
Merge branch '15.6'
|
2021-11-01 15:23:15 +08:00 |
|
|
xieqiyu
|
21ad4ecf0a
|
* Code for bug#15543.Modify the consumed hours of the project in the block.
|
2021-10-16 08:27:28 +08:00 |
|
|
xieqiyu
|
5cd2f5d2db
|
* Code for bug#15543.
|
2021-10-15 14:45:01 +08:00 |
|
|
xieqiyu
|
5697ba482a
|
* Fix bug#15543.
|
2021-10-15 14:13:41 +08:00 |
|
|
xieqiyu
|
8e38b12360
|
* Code for bug#14879.
|
2021-10-15 08:06:44 +08:00 |
|
|
xieqiyu
|
140f2f88c8
|
* Fix bug#15524.
|
2021-10-14 16:17:01 +08:00 |
|
|
hufangzhou
|
0541e5a87c
|
* Code for bug #15518.
|
2021-10-14 16:01:31 +08:00 |
|
|
hufangzhou
|
e6640c6f2c
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-14 15:46:54 +08:00 |
|
|
hufangzhou
|
ac5781d88f
|
* Fix bug #15528.
|
2021-10-14 15:46:50 +08:00 |
|
|
xieqiyu
|
b7da8b63b3
|
* Code for bug#15513.
|
2021-10-14 15:32:37 +08:00 |
|
|
tianshujie
|
91f8db484c
|
* Fix bug #15511.
|
2021-10-14 15:09:20 +08:00 |
|
|
xieqiyu
|
92462e266a
|
* Code for bug#15518.
|
2021-10-14 14:47:32 +08:00 |
|
|
hufangzhou
|
11f7e9cfb7
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-14 14:28:55 +08:00 |
|
|
hufangzhou
|
3363c1adbf
|
* Code for bug #15518.
|
2021-10-14 14:28:49 +08:00 |
|
|
tianshujie
|
5c867b2c96
|
* Fix bug #15525.
|
2021-10-14 14:11:14 +08:00 |
|
|
hufangzhou
|
07fbc65dfd
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-14 13:52:05 +08:00 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
tianshujie
|
ab662e5cf4
|
* Fix bug #15511.
|
2021-10-14 13:31:08 +08:00 |
|
|
tianshujie
|
77f7f7407f
|
* Fix bug #15522.
|
2021-10-14 13:16:40 +08:00 |
|
|
tianshujie
|
993a02eb78
|
* Fix bug #15521.
|
2021-10-14 11:31:38 +08:00 |
|
|
tianshujie
|
264a20d583
|
* Fix bug #15516.
|
2021-10-14 10:47:07 +08:00 |
|
|
liyuchun
|
6e94ad01de
|
Merge branch '15.6' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-14 10:06:25 +08:00 |
|
|
xieqiyu
|
b811e3c80d
|
* Fix bug#15513.
|
2021-10-14 10:05:58 +08:00 |
|
|
liyuchun
|
01e57a1c57
|
* Fix bug #15514.
|
2021-10-14 10:05:53 +08:00 |
|
|
tianshujie
|
04fce5278b
|
* Fix bug #15500.
|
2021-10-14 09:37:41 +08:00 |
|
|
xieqiyu
|
02717dbe64
|
* Fix bug#15512.
|
2021-10-14 09:20:32 +08:00 |
|
|
liyuchun
|
756576f2e4
|
* Finish task #43205.
|
2021-10-14 09:00:36 +08:00 |
|
|
丁国栋
|
ce8cbfe590
|
Merge branch 'master' into 'master'
* Fix bug that fetching users form GitLab API limited to 20 users.
See merge request easycorp/zentaopms!44
|
2021-10-13 09:51:50 +00:00 |
|
|
hufangzhou
|
4ca1a13e34
|
* Fix bug #15504.
|
2021-10-13 17:46:10 +08:00 |
|
|
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 |
|
|
王怡栋
|
25737f9366
|
Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6
|
2021-10-12 13:03:13 +08:00 |
|
|
王怡栋
|
ee892ef350
|
* fix for api.
|
2021-10-12 13:02:39 +08:00 |
|