 liyuchun
|
a2b3fe0ff1
|
* Fix bug #15636.
|
2021-10-19 19:17: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 |
|
|
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 |
|
|
zhujinyong
|
3653106d27
|
+ Add action name of api.
|
2021-10-19 17:14:30 +08:00 |
|
|
xieqiyu
|
51277c5580
|
* Fix bug#15614.
|
2021-10-19 17:11:11 +08:00 |
|
|
zhujinyong
|
6e50785589
|
Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
|
2021-10-19 16:54:44 +08:00 |
|
|
zhujinyong
|
17cf1b620a
|
* Fix bug#15586.
|
2021-10-19 16:53:55 +08:00 |
|
|
孙广明
|
b68ad1f9a9
|
Merge branch 'sprint/167_sunhao/picker' into 'sprint/167'
* Improve UI for picker, clear search keys when select option by Enter key in multiple mode.
See merge request easycorp/zentaopms!100
|
2021-10-19 08:49:34 +00:00 |
|
|
Hao Sun
|
e2a25fb6f8
|
* Improve UI for picker, clear search keys when select option by Enter key in multiple mode.
|
2021-10-19 16:44:40 +08:00 |
|
|
zhujinyong
|
8f7c0e6f47
|
* Merge manually.
|
2021-10-19 16:24:10 +08:00 |
|
|
zhujinyong
|
62b2b79a24
|
Merge branch 'sprint/167_xiawenlong_api' into sprint/167
|
2021-10-19 16:20:47 +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 |
|
|
zhujinyong
|
8bba71d6bb
|
* Fix get method of user api.
|
2021-10-19 16:14:51 +08: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 |
|
|
孙广明
|
b8c1cf99e6
|
Merge branch 'sprint/167_liyuchun_api' into 'sprint/167'
Add cases of testcase.
See merge request easycorp/zentaopms!96
|
2021-10-19 07:49:52 +00:00 |
|
|
liyuchun
|
350285bbd0
|
* Adjust cases of testcase.
|
2021-10-19 15:36:01 +08:00 |
|
|
朱金勇
|
c6b2921dc0
|
Merge branch 'sprint/167_xiawenlong_api' into 'sprint/167'
Sprint/167 xiawenlong api
See merge request easycorp/zentaopms!95
|
2021-10-19 07:14:48 +00:00 |
|
|
xiawenlong
|
0ea60016a7
|
add permission.
|
2021-10-19 15:09:13 +08:00 |
|
|
liyuchun
|
a2afa49845
|
* Add cases of testcase.
|
2021-10-19 15:06:01 +08:00 |
|
|
王怡栋
|
e75d061537
|
Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Add the privilege in changelog.
See merge request easycorp/zentaopms!94
|
2021-10-19 06:56:36 +00:00 |
|
|
hufangzhou
|
779aff3efb
|
* Add the privilege in changelog.
|
2021-10-19 14:54:44 +08:00 |
|
|
xiawenlong
|
7f733c3ad3
|
fix language fie.
|
2021-10-19 14:48:08 +08:00 |
|
|
孙广明
|
7155161701
|
Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167'
* Fix bug #15541.
See merge request easycorp/zentaopms!83
|
2021-10-19 06:44:48 +00:00 |
|
|
孙广明
|
2f123ce5ab
|
Merge branch 'sprint/167_zenggang_15548' into 'sprint/167'
* Fix bug#15548
See merge request easycorp/zentaopms!92
|
2021-10-19 06:42:33 +00:00 |
|