Commit Graph

414 Commits

Author SHA1 Message Date
liumengyi
79813a2166 * Modify judgment. 2022-01-17 18:53:45 +08:00
liumengyi
c11615933a * Fix bug #18625. 2022-01-17 18:51:50 +08:00
liumengyi
47e7cd7f10 * Fix bug #18625. 2022-01-17 18:46:58 +08:00
liumengyi
842ca07618 * Fix bug #18625. 2022-01-17 18:25:39 +08:00
孙广明
66515d7ed8 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.

See merge request easycorp/zentaopms!1420
2022-01-17 00:57:03 +00:00
孙广明
758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
liumengyi
fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
Hao Sun
dff300cf88 * Task #46524, refactor user selector for page "project/managemembers". 2021-12-30 17:02:32 +08:00
王怡栋
0d2f111a67 * fix error for php8.0. 2021-12-24 08:40:34 +08:00
朱金勇
8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
liyuchun
df21c2f8bf * Fix bug #17521. 2021-12-14 16:56:40 +08:00
Yurun
c89277b5fc Optimize user module 2021-12-11 09:06:08 +08:00
王怡栋
c16478c5d0 * fix for upgrade from lower version. 2021-12-03 15:47:39 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋
8fc78ccd45 * adjust for api. 2021-11-29 13:06:47 +08:00
孙广明
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
王怡栋
77b0b5d61e * code for task #44305. 2021-11-16 09:31:10 +08:00
王怡栋
784f729a81 * code for task #43338. 2021-10-21 15:10:40 +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