Commit Graph

397 Commits

Author SHA1 Message Date
孙广明
2dc2c46737 * Fix bug #16703. 2021-11-24 10:55:42 +08:00
liyuchun
412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
xieqiyu
3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
liyuchun
cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
王怡栋
f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
zenggang
ee07a042a4 * Fix bug#15211,14525 2021-09-16 17:31:40 +08:00
王怡栋
4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋
c6922215ae * fix bug for edit build and compute userview. 2021-08-27 14:42:14 +08:00
holan20180123
9cdb127be6 * Finish task #41712. 2021-08-25 10:50:21 +08:00
王怡栋
11f7edc064 * finish task #41753. 2021-08-25 09:55:44 +08:00
王怡栋
808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
dingguodong
2c0f0414ac + Add function getUserDetailsForAPI to user module. 2021-08-19 09:47:01 +08:00
孙广明
54f244cbba * Fix compute user view method. 2021-08-09 15:06:41 +08:00
hufangzhou
752d33949a * Fix an error. 2021-08-04 08:11:46 +08:00
wangyidong
d6e08c274e * adjust priv. 2021-08-03 15:33:32 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong
8d37af5669 * code for task #40451. 2021-07-28 17:49:03 +08:00
Yagami
683792d62f * Fix priv bug. 2021-07-28 16:24:41 +08:00
Yagami
04b4c24534 * Fix priv bug. 2021-07-28 15:58:46 +08:00
qiyu-xie
599e51660b * Finish task#40489. 2021-07-22 13:39:59 +08:00
Yagami
f401a0ac06 * Code for task #40118. 2021-07-14 15:55:03 +08:00
zenggang
86a0e7d8bf finish task #40123 2021-07-14 09:32:48 +08:00
wangyidong
fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong
3f0aeaf173 * finish task #39793. 2021-07-06 13:34:44 +08:00
wangyidong
5016d4751d * finish task #39796. 2021-07-02 11:26:13 +08:00
wangyidong
c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
holan20180123
84b1280ab0 * Adjust save user acl. 2021-06-29 16:05:16 +08:00
wangyidong
1af22a4ae1 * finish task #38717. 2021-06-21 16:09:21 +08:00
hufangzhou
23206c4ea8 * Finish task #39453. 2021-06-17 17:43:56 +08:00
hufangzhou
e4023e6b99 * Adjust the code. 2021-06-09 11:47:22 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
holan20180123
f36338d4e0 * Fix error. 2021-05-13 14:30:10 +08:00
holan20180123
51af4491d9 * Return id when create object by API. 2021-05-12 17:33:59 +08:00
Guanxiying
962685950e * Add field param to comments of getById function. 2021-04-28 11:41:02 +08:00
Guanxiying
3264f6146f * Fix comments of getById function. 2021-04-27 19:17:15 +08:00
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
Yagami
62bc93ee58 * Fix bug. 2021-04-09 14:52:03 +08:00
Yagami
c710bcc6d4 * Fix bug. 2021-04-09 14:10:59 +08:00
wangyidong
0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
Yagami
5d21cfb236 * Fix priv bug. 2021-04-07 14:35:11 +08:00
tianshujie98
b1d9b5d1d4 * Solve the problem of adding projects to the classic version. 2021-04-02 13:43:14 +08:00
Yagami
fcab5dd888 * Fix bug #11300. 2021-03-31 15:28:26 +08:00
wangyidong
faf5134ab3 * fix bug #11064. 2021-03-31 13:41:37 +08:00
wangyidong
34347209e9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:53:37 +08:00
wangyidong
5e98a02375 * finish task #36745. 2021-03-30 16:41:22 +08:00
holan20180123
a881b796dd * Finish task #37033. 2021-03-30 09:58:48 +08:00
holan20180123
f5a667ce24 * Fix bug #11049. 2021-03-29 11:29:45 +08:00
Yagami
7f7bfa5578 * Drop no menu module. 2021-03-22 16:21:48 +08:00
Yagami
1241e1a769 * Fix code error. 2021-03-12 13:29:48 +08:00
Yagami
d0b8f6164b * Add order by to user view. 2021-03-11 15:24:28 +08:00