Commit Graph

378 Commits

Author SHA1 Message Date
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
holan20180123
0a9d1bb510 * Finish task #36495. 2021-03-10 15:31:39 +08:00
Yagami
183feb3936 * Finish task #36465. 2021-03-10 10:24:22 +08:00
qiyu-xie
8eef5aa4e8 * Modify user module bug. 2021-03-05 11:29:37 +08:00
qiyu-xie
993d852d2e * Modify user module. 2021-03-05 08:58:06 +08:00
zhujinyong
7cb63e2f13 * Adjust code of my, project, user module. 2021-03-04 17:34:15 +08:00
Yagami
294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
holan20180123
3f3067b283 * Remove risk and issue. 2021-02-25 14:14:48 +08:00
holan20180123
b7d098546f * Finish task #36018. 2021-02-24 14:03:26 +08:00
Yagami
ecfb315a37 * Finish task #36018. 2021-02-23 09:45:04 +08:00
holan20180123
1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
holan20180123
abec7b041b * Fix bug #10950. 2021-02-05 16:57:01 +08:00
holan20180123
d74361b03a * Finish task #9097. 2021-01-29 16:01:03 +08:00
holan20180123
c26a63e7fb * Finish task #9118. 2021-01-28 14:46:12 +08:00
holan20180123
47731bb3c9 * Finish task #9097. 2021-01-28 11:27:47 +08:00
holan20180123
3b1717a354 * Finish task #9072. 2021-01-28 09:29:19 +08:00
Yagami
23f1c4b024 * Code for task #5688. 2021-01-18 17:29:36 +08:00
holan20180123
c9f0612924 * Finish task #9002. 2021-01-13 15:04:11 +08:00
qiyu-xie
d5f35eb927 * Finish task#8874. 2021-01-04 09:50:44 +08:00
hufangzhou
72666ee3c6 * Adjust the code. 2021-01-03 15:46:13 +08:00