 朱金勇
|
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 |
|
|
王怡栋
|
3b1d8b46a1
|
Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Fix an error for upgrade sql.
See merge request easycorp/zentaopms!91
|
2021-10-19 06:21:43 +00:00 |
|
|
hufangzhou
|
bf96595c5d
|
* Fix an error for install sql.
|
2021-10-19 14:20:49 +08:00 |
|
|
hufangzhou
|
328075c419
|
* Fix an error for upgrade sql.
|
2021-10-19 14:15:27 +08:00 |
|
|
王怡栋
|
75c34e7e46
|
Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167'
* Add the upgrade sql in upgrade module.
See merge request easycorp/zentaopms!90
|
2021-10-19 05:50:50 +00:00 |
|
|
hufangzhou
|
e5d8340402
|
* Add the upgrade sql in upgrade module.
|
2021-10-19 13:48:28 +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 |
|
|
zenggang
|
4c6d8f5a99
|
* Fix bug#15548
|
2021-10-19 04:04:01 +00:00 |
|
|
李玉春
|
a11155b1db
|
Merge branch 'sprint/167_sgm_apitest' into 'sprint/167'
* Add insert user test.
See merge request easycorp/zentaopms!89
|
2021-10-19 03:56:56 +00:00 |
|
|
王怡栋
|
6ee64dffe7
|
Merge branch 'api_doc' into sprint/167
|
2021-10-19 11:36:19 +08:00 |
|
|
孙广明
|
eea0631507
|
* Add insert user test.
|
2021-10-19 11:03:44 +08:00 |
|
|
zhujinyong
|
4bb27b624e
|
* Adjust code for Api doc.
|
2021-10-19 11:00:55 +08:00 |
|
|
王怡栋
|
57fcb19976
|
Merge branch 'sprint/167_sgm_apitest' into 'sprint/167'
* Fix story bug and add user test.
See merge request easycorp/zentaopms!88
|
2021-10-19 01:46:51 +00:00 |
|
|
孙广明
|
27086797f3
|
* Fix story bug and add user test.
|
2021-10-19 08:54:24 +08:00 |
|
|
李玉春
|
310190aeb9
|
Merge branch 'sprint/167_mayue_15506' into 'sprint/167'
Sprint/167 mayue 15506
See merge request easycorp/zentaopms!87
|
2021-10-18 09:32:25 +00:00 |
|
|
mayue
|
d506cba4a5
|
*Fix bug #15506.
|
2021-10-18 17:17:13 +08:00 |
|
|
xiawenlong
|
e667a33996
|
fix English language.
|
2021-10-18 17:14:18 +08:00 |
|
|
mayue
|
1bfd0b0b62
|
* Fix bug #15506.
|
2021-10-18 16:55:50 +08:00 |
|
|
xiawenlong
|
d7166c8bc1
|
fix code style.
|
2021-10-18 16:46:08 +08:00 |
|
|
xiawenlong
|
90a357a980
|
finish api release manage.
|
2021-10-18 16:42:38 +08:00 |
|
|
李玉春
|
68c2d64f67
|
Merge branch 'sprint/167_xieqiyu_15561' into 'sprint/167'
* Fix bug#15561.
See merge request easycorp/zentaopms!86
|
2021-10-18 08:39:46 +00:00 |
|
|
xieqiyu
|
e9b614a72b
|
* Fix bug#15561.
|
2021-10-18 16:37:36 +08:00 |
|
|
王怡栋
|
7f1f5c8993
|
Merge branch 'sprint/167_hufangzhou_15557' into 'sprint/167'
* Fix bug #15557.
See merge request easycorp/zentaopms!85
|
2021-10-18 08:35:14 +00:00 |
|
|
hufangzhou
|
cf3654bd0d
|
* Modify the variable name.
|
2021-10-18 16:34:33 +08:00 |
|
|
hufangzhou
|
20fbf2436c
|
* Modify the variable name.
|
2021-10-18 16:32:31 +08:00 |
|
|
hufangzhou
|
5691e39633
|
* Fix bug #15557.
|
2021-10-18 16:27:36 +08:00 |
|
|
xiawenlong
|
e1bed5bc55
|
finish api release.
|
2021-10-18 16:13:46 +08:00 |
|