Commit Graph
346 Commits
Author SHA1 Message Date
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
Lufei b19ce38241 * Fix doc comment for user module. 2022-12-22 16:27:40 +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
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +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
tianshujie 5031451ce8 * Fix bug #29000. 2022-10-28 09:53:28 +08:00
wangyidong fd861ec262 * code for task #72274. 2022-10-21 08:50:45 +08:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
liumengyi 28bd299fee * Fix bug for task #62949. 2022-08-05 15:04:34 +08:00
liumengyi 08ffbda087 * Optimize code for task #62949. 2022-08-03 09:03:19 +08:00
liumengyi 7c8df39c3c * Finish task #62949. 2022-08-02 16:08:10 +08:00
liumengyi 8aa6469edb * Fix bug #25079. 2022-07-21 09:48:58 +08:00
tianshujie c4e930ce49 * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 10:41:23 +08:00
tianshujie 102326db4f * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 09:48:08 +08:00
tianshujie 8c173c0770 * Fix bug #24686. 2022-07-04 15:01:46 +08:00
tianshujie 31dda1ebb8 * Fix bug #24686. 2022-07-04 08:16:34 +08:00
tianshujie a9f92875b4 * Fix the expiration message displayed on the login page of the new installation environment. 2022-06-30 08:55:20 +08:00
wangyidong 4f5b6a6597 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-28 15:29:41 +08:00
wangyidong 549bd70626 * code for bug #24381. 2022-06-28 15:29:11 +08:00
xieqiyu 320c88d44d * Finish task#58584. 2022-06-28 13:30:51 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 226a7fc69b * Finish task #57893. 2022-06-21 16:37:35 +08:00
tianshujie a6db8b4999 * Fix bug #24005. 2022-06-21 14:54:17 +08:00
tianshujie 42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
tianshujie 367f96a886 * Finish task #57894. 2022-06-21 13:47:08 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
leiyong 32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
王怡栋 6325ce1ccc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* recover user

See merge request easycorp/zentaopms!3872
2022-06-13 02:09:30 +00:00
lanzongjun 7c6b288878 * recover user 2022-06-10 17:26:57 +08:00
zenggang 8c5c2f2149 * Finish task#56549,56552 2022-06-10 00:51:11 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
lanzongjun b31b45c11f * finish task #56023 2022-06-08 15:44:50 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 cf5dbf0f23 * Remove unused code. 2022-06-02 14:53:51 +08:00
孙广明 23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
leiyong 71a4c1099d * Adjust the prompt text for plugin expiration. 2022-05-26 10:39:16 +00:00
leiyong 4744448fc5 * Adjust method name. 2022-05-26 07:43:52 +00:00
leiyong ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
孙广明 c4e649ef25 * Finish task #54186. 2022-05-17 09:35:32 +08:00
hufangzhou 401ea2f810 * Fix bug #22407. 2022-05-13 08:47:46 +08:00