Commit Graph
1607 Commits
Author SHA1 Message Date
Yagami 3c67709885 * Fix group options of batch create users. 2023-05-19 10:08:46 +08:00
Yagami 5935f603f4 * Change judgment condition. 2023-05-04 18:57:45 +08:00
Yagami c4c20cae54 * Change judgment condition. 2023-05-04 18:04:34 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
wangyidong 48aa1ce2f7 * fix bug. 2023-04-21 14:02:24 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
hufangzhou 00ab038bbf * Code for task #91375. 2023-04-18 11:05:43 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
caoyanyi b425266ecf * Code for bug #33884. 2023-04-13 13:07:44 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
朱金勇 14a560aeb1 * Fix create user. 2023-04-12 05:10:18 +00:00
朱金勇 e39b1143e3 * Fix bug: no project in zt_usergroup. 2023-04-12 05:07:37 +00:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
tanghucheng c89ecac12b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 09:19:02 +08:00
Yagami 5563f06aa3 * Product's reviewer and PMT can view it. 2023-03-29 09:51:41 +08:00
hufangzhou 72461a4df0 * Remove the comma. 2023-03-21 09:02:38 +08:00
hufangzhou f4f2473674 * Fix bug #33101. 2023-03-21 08:50:27 +08:00
liumengyi 1ae540dbe7 * Fix bug #33003. 2023-03-16 05:49:21 +00:00
caoyanyi 9ffce9d8a7 * Modify project lang to variable. 2023-03-06 10:19:48 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
wangyidong 3935b86775 * fix bug #32306. 2023-03-02 16:01:53 +08:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
caoyanyi 0c167c57fd * Add language. 2023-02-23 09:05:11 +08:00
caoyanyi 305453880d * Modify my module language. 2023-02-22 17:19:34 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
Yagami b903cd3828 * Fix bug #32160. 2023-02-15 13:27:42 +08:00
liuhong 5a67e1409c * Resolved feedback 2021. 2023-02-13 07:34:00 +00:00
liuhong 02b6a7a9ea * Resolved feedback #2021. 2023-02-13 06:01:35 +00:00
liumengyi bd86dca878 * Fix bug for empty password. 2023-01-31 16:31:51 +08:00
liumengyi 31ef1a19a3 * Fix bug for can no password. 2023-01-29 10:42:22 +08:00
chaideqing 971133f23d * Fix can bypass permissions. 2023-01-13 06:39:03 +00:00
Yagami 918422b13f * Fix product priv bug. 2023-01-09 16:58:35 +08:00
zenggang 2014040461 * Adjust code 2023-01-06 06:58:49 +00:00
Lufei b19ce38241 * Fix doc comment for user module. 2022-12-22 16:27:40 +08:00
chaideqing 4f5d210d1f * Fix feedback 1657. 2022-12-15 10:40:07 +08:00
chaideqing a4c89f47d6 * Fix feedback1714. 2022-12-12 15:49:07 +08:00
Lufei 91d4f420ec * Change resetFileName. 2022-12-08 14:00:48 +08:00
xieqiyu ef70a4c142 * Fix bug#30188. 2022-11-24 09:57:35 +08:00
王怡栋 476ceeaa6a Merge branch 'bug_27991' into 'master'
Bug 27991

See merge request easycorp/zentaopms!6319
2022-11-23 05:44:52 +00:00
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
xieqiyu bfafc2996d * Fix bug#30026. 2022-11-23 10:54:51 +08:00
孙广明 fb274164f6 Merge branch 'sprint/scx_userapi' into 'master'
Sprint/scx userapi

See merge request easycorp/zentaopms!6203
2022-11-16 09:21:03 +00:00
宋辰轩 cdb40c8190 * Modify user api bug. 2022-11-16 16:27:09 +08:00
zenggang 8370d27ee4 * Fix feedback#1231 2022-11-16 08:24:12 +00:00
zenggang 921de5b4f1 * Fix feedback#1452 2022-11-16 01:13:55 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
wangyidong d354c68adf * adjust for task #74928. 2022-11-07 15:19:58 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00