Commit Graph
577 Commits
Author SHA1 Message Date
liumengyi 7a0ab93f73 * Fix bug of duplicate key after deleting users from zt_user. 2023-11-21 14:24:26 +08:00
songchenxuan fe3c2de13f * Merge commit dc31210bfb. 2023-11-10 10:39:29 +08:00
tanghucheng c5622ac450 * Merge #c4c20cae54,Change judgment condition. 2023-11-09 00:14:42 -05:00
songchenxuan e58d70bb62 * Merge commit 3e7e5b184d, fix bug #27659. 2023-11-08 09:50:24 +08:00
liumengyi fa083989fe * Set the default value of join to null. 2023-11-07 15:49:07 +08:00
liumengyi 7a88f42ac7 * Fix bug #40262. 2023-11-07 15:39:10 +08:00
liumengyi dabd436bd8 * Log action when batch editing user. 2023-11-02 16:47:28 +08:00
liumengyi 9b54f43308 * Fix bug of user::batchCreate. 2023-11-02 16:35:59 +08:00
wangyidong 1858c2a3f6 * Rewrite projectstory story page. 2023-10-31 16:59:51 +08:00
daitingting 37b917b49a * Adjust the way for prompt. 2023-10-31 07:42:26 +00:00
tanghucheng 838d3478fa * Merge: comment#5563f06aa3, Product's reviewer and PMT can view it. 2023-10-30 23:25:21 -04:00
songchenxuan 05a7cb6938 * Fix batchCreate page not work. 2023-10-19 15:48:30 +08:00
zhouxin 1bdf550bf8 * Fix error of create user when no group chosed. 2023-10-19 11:04:29 +08:00
songchenxuan 4e504d67e8 * Modify user test. 2023-10-18 11:17:12 +08:00
songchenxuan 3f9567a34f * Modify user test. 2023-10-16 19:10:58 +08:00
朱金勇 24285d03c5 * Fix type of task left. 2023-10-13 02:22:00 +00:00
朱金勇 bde6af1d93 * Migrate changes of 18.x to master. 2023-10-12 01:16:07 +00:00
tianshujie 7b50d46de0 * Merge 18 version code. 2023-10-11 15:57:14 +08:00
dingguodong 0bd6b5c935 * Return empty result if both objects and appended users are empty. 2023-09-27 09:39:38 +08:00
dingguodong 6177249cb1 * Allow objectIDs parameter can be empty. 2023-09-26 15:51:22 +08:00
wangyidong b33ce2a843 * Rewrite story edit method. Code for task #102969. 2023-09-22 17:13:25 +08:00
wangyidong 6bb0ae30aa * Rewrite program browse page. 2023-09-14 11:27:51 +08:00
dingguodong fe3053e1e4 * Fix type error. 2023-09-14 09:17:31 +08:00
dingguodong 6589fd4597 * Fix type error, groups is string type in open12. 2023-09-14 08:38:30 +08:00
wangyidong 284ab1de59 * Adjust for unit. 2023-09-13 16:38:17 +08:00
caoyanyi 9df6819f02 * Change param and return value for user processAccountSort. 2023-08-28 16:10:32 +08:00
dingguodong 0b7c7329e5 * Replace leftjoin to leftJoin. 2023-08-24 16:49:54 +08:00
wangyuting 42a53cf89a * Finish cropavatar user avatar. 2023-08-01 10:34:13 +08:00
liugang 1fb0110c70 * userModel: remove unused '<br/>' string. 2023-07-27 10:35:54 +08:00
dingguodong 615cf0b19a * Optimize the comment and filter. 2023-07-26 16:10:04 +08:00
wangyidong ca06dbe9a4 * Adjust for user featurebar. 2023-07-20 08:28:42 +08:00
wangyidong 6fd7d0943d * Rewrite for batch edit user page. 2023-07-19 13:36:24 +08:00
朱金勇 e636eaf108 - Remove array('' => '') for select. 2023-07-12 04:15:29 +00:00
朱金勇 640e8f4482 * Use helper::setcookie. 2023-07-11 07:28:39 +00:00
朱金勇 ad288b3f1d * Use isServing() instead of IN_USE. 2023-07-10 05:56:05 +00:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
朱金勇 3a215d708a * Refactor framework for roadrunner. 2023-07-09 14:30:31 +00:00
liugang 454664e7d0 * userModel: refactor the createContactList method and the updateContactList method. 2023-07-08 16:58:16 +08:00
liugang 80fd50f8ca * userModel: fix error of return different result based on the $mode parameter. 2023-07-08 10:43:19 +08:00
liugang cabf508ca7 * userModel: the getContactLists method return different result based on the $mode parameter. 2023-07-08 10:30:20 +08:00
liugang e80b53a681 * userModel: simplify the getContactLists method. 2023-07-08 10:06:24 +08:00
liumengyi c0d50ea15b * Refactor ui of user::edit. 2023-06-27 16:16:44 +08:00
liumengyi b624dacdd4 * Refactor user::batchCreate. 2023-06-21 14:48:41 +08:00
wangyuting d113078492 * Finish create user page. 2023-06-20 13:34:22 +08:00
wangyuting 4a6a057c05 * Add js on create user page. 2023-06-20 11:21:02 +08:00
liumengyi bc66054557 * Refactor company::browse. 2023-06-14 11:28:48 +08:00
wangyidong c969e7216d * Rewrite user task page. 2023-06-13 15:46:08 +08:00
wangyidong 7fcea662ba * Code for task #95303. 2023-06-13 15:46:08 +08:00
zenggang a6b49e9e68 * Bug batchResolve ajaxLoadExecutionTeamMembers method 2023-05-26 06:13:07 +00:00
chaideqing 7a0f4b209c * Refactor unit test of project-model-updateinvolveduserview. 2023-05-11 20:21:58 +08:00