 zhujinyong
|
3f5c7fed0f
|
Merge branch 'sprint/167_liyuchun_15639' into sprint/167
|
2021-10-19 20:40:59 +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 |
|
|
朱金勇
|
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 |
|
|
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 |
|
|
zhujinyong
|
879066853e
|
+ Add charset of table.
|
2021-10-19 19:17:09 +08:00 |
|
|
xiawenlong
|
99fd35321f
|
fix sql.
|
2021-10-19 19:14:24 +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 |
|
|
李玉春
|
0959ee3ef2
|
Merge branch 'sprint/167_hufangzhou_15637' into 'sprint/167'
* Fix bug #15637.
See merge request easycorp/zentaopms!110
|
2021-10-19 10:27:05 +00: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 |
|
|
hufangzhou
|
dd618cf53e
|
* Fix bug #15637.
|
2021-10-19 18:20:35 +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 |
|
|
李玉春
|
7967afd49a
|
Merge branch 'sprint/167_tianshujie_15634' into 'sprint/167'
* Fix bug #15634.
See merge request easycorp/zentaopms!108
|
2021-10-19 10:14:30 +00: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 |
|
|
李玉春
|
71c5b684fd
|
Merge branch 'sprint/167_hufangzhou_compatible' into 'sprint/167'
* Compatible with pro version in mobile.
See merge request easycorp/zentaopms!104
|
2021-10-19 09:47:02 +00: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 |
|
|
hufangzhou
|
c576e60197
|
* Compatible with pro version in mobile.
|
2021-10-19 17:36:13 +08: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 |
|