Commit Graph
88 Commits
Author SHA1 Message Date
hufangzhou 504d19ee92 * Fix bug #17995. 2022-03-28 11:09:12 +08:00
hufangzhou b3003228e0 * Fix bug #17264. 2022-03-22 10:14:18 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
hufangzhou b7ca55d9ca * Adjust the params of createDemoData when manual import. 2021-12-27 11:36:46 +08:00
zhujinyong 9ed65123b5 * Fix bug: display dropmenu when no lib. 2021-12-21 11:27:55 +08:00
zhujinyong 411b060895 + Create demo data for api. 2021-12-21 09:36:25 +08:00
zhujinyong 40e6051daa - Remove die() of admin module. 2021-12-20 09:15:34 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
zhujinyong e5873a07e0 + Add demo lib for api. 2021-12-07 11:06:56 +08:00
zhujinyong f6d7234156 * Fix bugs of api. 2021-12-05 23:51:27 +08:00
zhujinyong 861e92107c + Add user type for api. 2021-12-03 10:01:01 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
liyuchun af1c32a406 * Fix bug #16208. 2021-11-12 08:43:50 +08:00
mayue 17118b4595 *Fix a bug #15739 2021-10-26 14:37:42 +08:00
liyuchun 5eb305f393 * Fix bug #15684. 2021-10-20 16:40:47 +08:00
liyuchun 2fb6e09218 * Fix bug #15663. 2021-10-20 11:18:10 +08:00
hufangzhou 8024914da1 * Fix bug #15652. 2021-10-20 09:26:52 +08: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
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
朱金勇 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 5db2b168de fix code style. 2021-10-19 19:04:30 +08:00
zhujinyong b913fbb993 * Fix location. 2021-10-19 18:45:01 +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
tianshujie 8d08c9cf1a * Fix bug #15634. 2021-10-19 18:12:08 +08:00
xiawenlong 2f28bb8c85 fix all level 1 and 3 bugs. 2021-10-19 17:49:39 +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
xieqiyu 51277c5580 * Fix bug#15614. 2021-10-19 17:11:11 +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 7f733c3ad3 fix language fie. 2021-10-19 14:48:08 +08:00
zhujinyong 64af527b27 * Adjust code for api. 2021-10-19 12:11:43 +08:00
zhujinyong 4bb27b624e * Adjust code for Api doc. 2021-10-19 11:00:55 +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
xiawenlong e1bed5bc55 finish api release. 2021-10-18 16:13:46 +08:00
xiawenlong 4f9086045a finish api release. 2021-10-14 15:57:38 +08:00
thanatos cb1613604f fix header action 2021-10-12 09:41:21 +08:00
zhujinyong 0c6c024bb1 * Fix menu vars. 2021-10-08 13:48:10 +08:00
zhujinyong 83d598745f * Finish task#43059. 2021-10-08 08:01:53 +08:00
zhujinyong 658ad668c0 * Format code. 2021-10-07 00:38:06 +08:00
thanatos 9b9d95f923 update params 2021-09-28 08:58:55 +08:00
thanatos c0e6b93d3f fix bug 2021-09-26 13:33:22 +08:00
thanatos dbeacce70f edit api doc 2021-09-24 08:48:47 +08:00
thanatos 1787e7a86c fix code style 2021-09-23 10:58:00 +08:00
zhujinyong adcb36c393 * Adjust code style. 2021-09-23 10:31:52 +08:00