 liyuchun
|
e8b2344122
|
* Adjust cases of testcase.
|
2021-10-21 13:06:02 +08:00 |
|
|
李玉春
|
a24fbb9075
|
Merge branch 'sprint/167_tianshujie_15698' into 'sprint/167'
* Fix bug #15698.
See merge request easycorp/zentaopms!129
|
2021-10-21 00:37:05 +00:00 |
|
|
tianshujie
|
69743fa3a4
|
* Fix bug #15698.
|
2021-10-21 08:32:55 +08:00 |
|
|
孙广明
|
78eb0b7ebc
|
Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167'
* Fix bug #15684.
See merge request easycorp/zentaopms!128
|
2021-10-20 09:11:48 +00:00 |
|
|
liyuchun
|
d92c073cb5
|
* Fix bug #15684.
|
2021-10-20 17:08:53 +08:00 |
|
|
孙广明
|
c16a7cc2f1
|
Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167'
* Fix bug #15684.
See merge request easycorp/zentaopms!127
|
2021-10-20 08:56:36 +00:00 |
|
|
liyuchun
|
5eb305f393
|
* Fix bug #15684.
|
2021-10-20 16:40:47 +08:00 |
|
|
孙广明
|
7cd46da726
|
Merge branch 'sprint/167_liyuchun_15592' into 'sprint/167'
* Fix bug #15592.
See merge request easycorp/zentaopms!125
|
2021-10-20 08:07:38 +00:00 |
|
|
liyuchun
|
fce0f3aafa
|
* Fix bug #15592.
|
2021-10-20 16:04:44 +08:00 |
|
|
孙广明
|
a3948383f8
|
Merge branch 'sprint/167_api_doc' into 'sprint/167'
* Fix bug #15674.
See merge request easycorp/zentaopms!124
zentaopms_15.7_20211020
|
2021-10-20 07:40:43 +00:00 |
|
|
李玉春
|
28698c9061
|
Merge branch 'sprint/167_tianshujie_15679' into 'sprint/167'
* Fix bug #15679.
See merge request easycorp/zentaopms!123
|
2021-10-20 07:34:30 +00:00 |
|
|
tianshujie
|
eaaed9cfe6
|
* Fix bug #15679.
|
2021-10-20 15:32:02 +08:00 |
|
|
liyuchun
|
3f279a9ec1
|
* Fix bug #15674.
|
2021-10-20 15:00:11 +08:00 |
|
|
朱金勇
|
53cccbed9f
|
Merge branch 'sprint/167_api_doc' into 'sprint/167'
fix many subfiled bug
See merge request easycorp/zentaopms!122
|
2021-10-20 05:59:34 +00:00 |
|
|
hufangzhou
|
e912a03df7
|
* Fix bug #15673.
|
2021-10-20 13:50:51 +08:00 |
|
|
xiawenlong
|
902d24ff14
|
fix code style
|
2021-10-20 13:48:18 +08:00 |
|
|
xiawenlong
|
e5cac550f5
|
fix many subfield bug.
|
2021-10-20 13:39:58 +08:00 |
|
|
zhujinyong
|
04d67237b7
|
* Cannot change account.
|
2021-10-20 11:26:43 +08:00 |
|
|
zhujinyong
|
9ca19c49d1
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-20 11:23:20 +08:00 |
|
|
zhujinyong
|
48e7adeb39
|
* Check gender value.
|
2021-10-20 11:23:00 +08:00 |
|
|
liyuchun
|
2fb6e09218
|
* Fix bug #15663.
|
2021-10-20 11:18:10 +08:00 |
|
|
hufangzhou
|
02f2bd22c6
|
* Fix bug #15669.
|
2021-10-20 11:07:24 +08:00 |
|
|
hufangzhou
|
409f2936cb
|
* Fix bug #15666.
|
2021-10-20 10:21:38 +08:00 |
|
|
hufangzhou
|
8024914da1
|
* Fix bug #15652.
|
2021-10-20 09:26:52 +08:00 |
|
|
朱金勇
|
9a7c381540
|
Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Adjust the lang file.
See merge request easycorp/zentaopms!120
|
2021-10-19 13:02:13 +00:00 |
|
|
hufangzhou
|
e3fc0a1bf5
|
* Adjust the lang file.
|
2021-10-19 21:00:11 +08:00 |
|
|
朱金勇
|
f0793bf911
|
Merge branch 'sprint/167_api_doc' into 'sprint/167'
fix api lib default access control
See merge request easycorp/zentaopms!119
|
2021-10-19 12:53:20 +00:00 |
|
|
xiawenlong
|
50ea48702e
|
fix api lib default access control
|
2021-10-19 20:51:13 +08:00 |
|
|
朱金勇
|
2b04f2ba14
|
Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix default body type.
See merge request easycorp/zentaopms!118
|
2021-10-19 12:42:52 +00:00 |
|
|
zhujinyong
|
20c2314588
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-19 20:41:10 +08:00 |
|
|
zhujinyong
|
3f5c7fed0f
|
Merge branch 'sprint/167_liyuchun_15639' into sprint/167
|
2021-10-19 20:40:59 +08:00 |
|
|
李玉春
|
724588ee19
|
Merge branch 'sprint/167_tianshujie_15638' into 'sprint/167'
* Fix bug #15638.
See merge request easycorp/zentaopms!115
|
2021-10-19 12:40:58 +00:00 |
|
|
xiawenlong
|
f02595167f
|
fix default body type.
|
2021-10-19 20:40:26 +08:00 |
|
|
朱金勇
|
235fa53d01
|
Merge branch 'sprint/167' into 'sprint/167_liyuchun_15639'
# Conflicts:
# module/api/lang/en.php
|
2021-10-19 12:40:17 +00:00 |
|
|
liyuchun
|
a2163a67d0
|
* Add auth of api.
|
2021-10-19 20:37:36 +08:00 |
|
|
liyuchun
|
9e83958e1c
|
* Adjust order of change log.
|
2021-10-19 20:34:59 +08:00 |
|
|
liyuchun
|
b32541f20f
|
* Fix bug #15639.
|
2021-10-19 20:32:06 +08:00 |
|
|
liyuchun
|
8c12096a92
|
* Fix bug #15639.
|
2021-10-19 20:23:19 +08:00 |
|
|
tianshujie
|
0b7c4c5f1c
|
* Fix bug #15638.
|
2021-10-19 20:18:42 +08:00 |
|
|
朱金勇
|
b21e0a29d3
|
Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Check the api module for package.
See merge request easycorp/zentaopms!116
|
2021-10-19 12:16:42 +00:00 |
|
|
hufangzhou
|
24795122b8
|
* Check the api module for package.
|
2021-10-19 20:12:57 +08:00 |
|
|
tianshujie
|
adef615386
|
* Fix bug #15638.
|
2021-10-19 19:41:05 +08:00 |
|
|
zhujinyong
|
d3a6af49b6
|
+ Add charset of zentao15.7.sql.
|
2021-10-19 19:34:42 +08:00 |
|
|
朱金勇
|
b0ba5cff66
|
Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
update sql.
See merge request easycorp/zentaopms!114
|
2021-10-19 11:32:35 +00:00 |
|
|
xiawenlong
|
d4133f4128
|
fix sql.
|
2021-10-19 19:29:51 +08:00 |
|
|
xiawenlong
|
79b78520a7
|
fix sql.
|
2021-10-19 19:28:25 +08:00 |
|
|
zhujinyong
|
5f40b9b51d
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-19 19:28:11 +08:00 |
|
|
zhujinyong
|
f81f49ea5d
|
+ Add charset of zentao.sql.
|
2021-10-19 19:27:53 +08:00 |
|
|
朱金勇
|
ef970d5005
|
Merge branch 'spirnt/167_liyuchun_15636' into 'sprint/167'
* Fix bug #15636.
See merge request easycorp/zentaopms!113
|
2021-10-19 11:19:28 +00:00 |
|
|
liyuchun
|
a2b3fe0ff1
|
* Fix bug #15636.
|
2021-10-19 19:17:15 +08:00 |
|