Commit Graph
93 Commits
Author SHA1 Message Date
liumengyi 6e118674b9 * Fix bug #26193. 2022-09-06 10:57:20 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
tianshujie a09b7662d7 * Finish task #62936. 2022-08-03 17:15:49 +08:00
tianshujie 175fd06bc2 * Finish task #62936. 2022-08-03 17:07:23 +08:00
zenggang f4d7a24cf3 * Fix batchadd user ajax error 2022-07-15 00:59:01 +00:00
liumengyi f711e0984e * Fix bug #24991. 2022-07-12 17:10:11 +08:00
tianshujie 42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
tianshujie aab46a8414 * Finish task #57894. 2022-06-21 13:55:06 +08:00
tianshujie b812104494 * Finish task #57894. 2022-06-21 13:14:06 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
liyuchun ff102f75c4 * Fix bug #20986. 2022-04-08 10:07:46 +08:00
zenggang 691cde081b * Fix bug#19960 2022-04-07 03:32:14 +00:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
王怡栋 f1f208db64 * fix bug #20669. 2022-03-11 14:06:04 +08:00
王怡栋 8053903ba2 * code for task #20556. 2022-03-11 10:03:48 +08:00
tanghucheng 6e0066af25 * Merge code. 2022-03-10 16:19:26 +08:00
孙广明 97859c945b Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
#   module/user/js/batchcreate.js
#   module/user/view/batchcreate.html.php
2022-03-10 08:07:31 +00:00
tanghucheng dc394cd674 * Fix code format. 2022-03-10 15:31:50 +08:00
tanghucheng 31588aacc7 * Adjust for batchcreate user. 2022-03-10 15:23:40 +08:00
tanghucheng 76fd14c845 * Adjust for create user. 2022-03-10 12:09:33 +08:00
王怡栋 53c2dd44fb * fix bug #20113. 2022-03-10 10:31:10 +08:00
zhouxudong 2eb4271b2b * Finishi task #50425. 2022-03-09 13:20:09 +08:00
zhouxudong c8704e30f8 * Finish task #50425. 2022-03-09 11:29:09 +08:00
wangyidong 7425414bb8 * adjust for error. 2021-02-20 14:42:54 +08:00
holan20180123 80b1c44d4a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 15:24:07 +08:00
holan20180123 1e7beb09af * Finish task #36018. 2021-02-19 15:23:32 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong fc28bbfc9e * adjust for verify rand. 2021-02-03 13:52:23 +08:00
wangyidong 06d82b5847 * fix bug. 2021-01-29 14:57:00 +08:00
wangyidong e5b0134b22 * finish task #9114. 2021-01-29 14:27:32 +08:00
holan20180123 c26a63e7fb * Finish task #9118. 2021-01-28 14:46:12 +08:00
holan20180123 c9f0612924 * Finish task #9002. 2021-01-13 15:04:11 +08:00
wangyidong 411fff6248 * finish task #8681. 2020-12-16 17:41:35 +08:00
wangyidong 5866f61a86 * Merge from master. 2020-12-16 17:36:51 +08:00
wangyidong ff9a3932cc * adjust for check one click package. 2020-12-09 10:53:04 +08:00
wangyidong 8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
Yagami f41ce9cdaa * Fix bug #2980. 2020-02-27 15:25:14 +08:00
wangyidong 329fa9056e * fix for pro login. 2019-12-05 08:58:10 +08:00
Yagami 24ca9fbc01 * Finish task #6542. 2019-11-20 10:00:56 +08:00
Yagami 800bc78722 * Finish task #6502. 2019-11-18 14:57:23 +08:00
wangyidong 1e3564a250 * finish task #6409. 2019-10-15 11:24:50 +08:00
wangyidong e9a8c643b3 * finish task #6258. 2019-08-21 08:59:50 +08:00
wangyidong 321b27c81b * finish task #6208. 2019-08-08 13:12:49 +08:00
wangyidong beefd94f9d * fix for compute password strength when login. 2019-08-07 11:30:45 +08:00
Yagami 09ae1056ea * Fix code for user module. 2019-06-26 17:24:41 +08:00
Catouse e8420fc3a7 * refactor codes. 2019-04-16 11:29:01 +08:00
wangyidong d98adeccba * finish task #4976. 2018-10-12 09:08:12 +08:00
wangyidong 75e0e6555b * finish task #4976. 2018-10-11 15:38:26 +08:00
wangyidong e69e353e99 * finish task #4823. 2018-09-04 16:00:04 +08:00
wangyidong 1da62a0412 * fix for misc-ping in login page. 2018-06-28 17:25:35 +08:00