Commit Graph

113 Commits

Author SHA1 Message Date
caoyanyi
28ce2717db * Fix bug #24582. 2022-07-21 13:28:26 +08:00
caoyanyi
df93073fe4 * Fix bug #24576. 2022-07-21 13:24:43 +08:00
hufangzhou
2fe046f186 * Fix bug #23942. 2022-06-30 13:25:33 +08:00
hufangzhou
cf73860013 * Fix bug #24545. 2022-06-30 10:09:19 +08:00
liumengyi
b920b76042 * Code review. 2022-06-24 14:20:33 +08:00
liumengyi
3cbc219ad5 * Code review. 2022-06-24 14:18:31 +08:00
liumengyi
5b84f06092 * Fix bug #24214. 2022-06-24 09:10:05 +08:00
王怡栋
03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
sunjun
2514a53fde fixbug 2022-06-22 06:03:07 +00:00
sunjun
c883c3b7a3 fixbug 2022-06-22 05:58:31 +00:00
sunjun
b0fbce7fd4 *Finish task #57888 2022-06-22 05:48:13 +00:00
liumengyi
8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
wangyidong
541f9dd0d1 * code for bug #58034. 2022-06-21 14:53:45 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
hufangzhou
bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
hufangzhou
8907f7c898 * Fix bug #15599. 2022-04-27 15:53:18 +08:00
hufangzhou
0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
hufangzhou
84f763e4b9 * Rebuild api lib code. 2022-04-25 14:11:51 +08:00
caoyanyi
38ad0cec35 * Adjust code. 2022-04-22 05:46:49 +00:00
caoyanyi
b8c0f822d9 * Add response data. 2022-04-22 05:38:48 +00:00
hufangzhou
abca99908b * Code for story #32201. 2022-04-22 09:49:59 +08:00
hufangzhou
18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
hufangzhou
baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
hufangzhou
87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
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