 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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
hufangzhou
|
24795122b8
|
* Check the api module for package.
|
2021-10-19 20:12:57 +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 |
|
|
zhujinyong
|
f17a9bd5f6
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-19 19:10:01 +08:00 |
|
|
朱金勇
|
3bebe533db
|
Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix code style.
See merge request easycorp/zentaopms!112
|
2021-10-19 11:09:40 +00:00 |
|
|
xiawenlong
|
1251aa587a
|
delete debug code.
|
2021-10-19 19:09:04 +08:00 |
|
|
xiawenlong
|
20fea2b68c
|
delete debug code.
|
2021-10-19 19:07:20 +08:00 |
|
|
xiawenlong
|
5db2b168de
|
fix code style.
|
2021-10-19 19:04:30 +08:00 |
|
|
zhujinyong
|
d6db6a965b
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-19 18:57:36 +08:00 |
|
|
zhujinyong
|
823fd5db59
|
* Format code.
|
2021-10-19 18:57:15 +08:00 |
|
|
liyuchun
|
fe9e1ac81e
|
Merge branch 'sprint/167_xieqiyu_15615' into sprint/167
|
2021-10-19 18:45:56 +08:00 |
|
|
zhujinyong
|
b913fbb993
|
* Fix location.
|
2021-10-19 18:45:01 +08:00 |
|
|
李玉春
|
1dea8203c0
|
Merge branch 'sprint/167' into 'sprint/167_xieqiyu_15615'
# Conflicts:
# module/api/view/index.html.php
|
2021-10-19 10:44:18 +00:00 |
|
|
xieqiyu
|
5479e2db3f
|
* Code for bug#15615.
|
2021-10-19 18:40:55 +08:00 |
|
|
李玉春
|
1e69e81346
|
Merge branch 'sprint/167_tianshujie_15620' into 'sprint/167'
* Fix bug #15620.
See merge request easycorp/zentaopms!111
|
2021-10-19 10:29:39 +00:00 |
|
|
tianshujie
|
44d842755e
|
* Adjust code of api module.
|
2021-10-19 18:28:53 +08:00 |
|
|
tianshujie
|
d6a56aaeab
|
* Adjust code of api module.
|
2021-10-19 18:25:20 +08:00 |
|
|
tianshujie
|
8a1948c487
|
* Fix bug #15620.
|
2021-10-19 18:23:10 +08:00 |
|
|
朱金勇
|
cf2f61ddb3
|
Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
Sprint/167 xiawenlong
See merge request easycorp/zentaopms!109
|
2021-10-19 10:18:18 +00:00 |
|
|
xiawenlong
|
a184ef1ce3
|
fix code style.
|
2021-10-19 18:15:24 +08:00 |
|
|
xieqiyu
|
b70e00dbad
|
* Adjust code style.
|
2021-10-19 18:14:27 +08:00 |
|
|
tianshujie
|
8d08c9cf1a
|
* Fix bug #15634.
|
2021-10-19 18:12:08 +08:00 |
|
|
xiawenlong
|
e872c187cf
|
fix group en language.
|
2021-10-19 18:09:48 +08:00 |
|
|
xieqiyu
|
cfaea6c602
|
* Fix bug#15615.
|
2021-10-19 17:59:36 +08:00 |
|
|
xiawenlong
|
2f28bb8c85
|
fix all level 1 and 3 bugs.
|
2021-10-19 17:49:39 +08:00 |
|
|
李玉春
|
579763d5f8
|
Merge branch 'sprint/167_sgm_fixbug' into 'sprint/167'
* Fix bug #15635.
See merge request easycorp/zentaopms!105
|
2021-10-19 09:44:29 +00:00 |
|
|
孙广明
|
d3a9f0fb73
|
* Fix bug #15635.
|
2021-10-19 17:42:53 +08:00 |
|
|
朱金勇
|
46b0477852
|
Merge branch 'sprint/167_xieqiyu_15628' into 'sprint/167'
* Fix bug#15628.
See merge request easycorp/zentaopms!103
|
2021-10-19 09:37:43 +00:00 |
|
|
xieqiyu
|
fe063ce0b9
|
* Fix bug#15628.
|
2021-10-19 17:34:15 +08:00 |
|
|
孙广明
|
9ed05281f1
|
Merge branch 'spirnt/167_liyuchun_15613' into 'sprint/167'
* Fix bug #15585.
See merge request easycorp/zentaopms!102
|
2021-10-19 09:32:25 +00:00 |
|
|
liyuchun
|
6eefec7f8c
|
* Fix bug #15585.
|
2021-10-19 17:20:31 +08:00 |
|
|
朱金勇
|
06a91b0175
|
Merge branch 'sprint/167_xieqiyu_15614' into 'sprint/167'
* Fix bug#15614.
See merge request easycorp/zentaopms!101
|
2021-10-19 09:15:14 +00:00 |
|
|
xieqiyu
|
51277c5580
|
* Fix bug#15614.
|
2021-10-19 17:11:11 +08:00 |
|
|
zhujinyong
|
17cf1b620a
|
* Fix bug#15586.
|
2021-10-19 16:53:55 +08:00 |
|
|
zhujinyong
|
8f7c0e6f47
|
* Merge manually.
|
2021-10-19 16:24:10 +08:00 |
|
|
朱金勇
|
e770ce54d1
|
Merge branch 'sprint/167' into 'sprint/167_xiawenlong_api'
# Conflicts:
# module/api/view/editlib.html.php
|
2021-10-19 08:18:16 +00:00 |
|
|
xiawenlong
|
b849261155
|
fix bugs.
|
2021-10-19 16:03:02 +08:00 |
|
|
zhujinyong
|
fc2e75eeb8
|
* Fix languages.
|
2021-10-19 15:59:07 +08:00 |
|
|
xiawenlong
|
0ea60016a7
|
add permission.
|
2021-10-19 15:09:13 +08:00 |
|
|
xiawenlong
|
7f733c3ad3
|
fix language fie.
|
2021-10-19 14:48:08 +08:00 |
|
|
zhujinyong
|
68e738fdd7
|
* Reformat code style.
|
2021-10-19 13:21:22 +08:00 |
|
|
zhujinyong
|
64af527b27
|
* Adjust code for api.
|
2021-10-19 12:11:43 +08:00 |
|