Commit Graph
1507 Commits
Author SHA1 Message Date
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
liumengyi 698510fadf * Fix bug #26325. 2022-08-12 13:13:38 +08:00
liumengyi c5522146da * Fix bug #26325. 2022-08-12 13:12:56 +08:00
liumengyi 9713a1d816 * Optimize code for task #63694. 2022-08-09 16:04:27 +08:00
liumengyi a286f17021 * Modify language items for task #63694. 2022-08-09 15:42:18 +08:00
liumengyi 45ba659ef9 * Add language item for task #63694. 2022-08-09 15:16:47 +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
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
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
zenggang 1b5b6d7e5e * Fix bug#25799 2022-07-28 07:21:35 +00:00
zenggang 56b4e30328 * Code for task#61964 2022-07-27 06:45:26 +00:00
zenggang 0baf0d5fda * Finish task#62107 2022-07-26 08:51:47 +00:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
孙广明 f95c3ee86f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4638
2022-07-22 05:42:16 +00:00
tianshujie 3db9286074 * Fix bug #25398. 2022-07-22 13:28:02 +08:00
孙广明 815c633bc7 * Code for my-index speed. 2022-07-22 10:26:59 +08:00
孙广明 9134845142 * Fix project admin bug. 2022-07-21 11:31:14 +08:00
liumengyi 8aa6469edb * Fix bug #25079. 2022-07-21 09:48:58 +08:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
zenggang f4d7a24cf3 * Fix batchadd user ajax error 2022-07-15 00:59:01 +00:00
tianshujie 66b29f2881 * Resolve issue #690. 2022-07-13 13:23:13 +08:00
tianshujie 7ce105940e * Resolve issue #690. 2022-07-13 13:17:02 +08:00
liumengyi f711e0984e * Fix bug #24991. 2022-07-12 17:10:11 +08:00
liumengyi b4b41b05cb * Finish task #60478. 2022-07-12 17:09:48 +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
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00: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
zenggang 3b87d63a4b * Fix bug #24663 2022-07-01 02:59:20 +00:00
tianshujie c971b72c48 * Fix bug #24579. 2022-06-30 14:19:48 +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
王怡栋 e05ac602cc Merge branch 'master_xieqiyu_58567' into 'master'
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
2022-06-28 09:31:57 +00:00
xieqiyu a757ea76c1 * Code for task#58567. 2022-06-28 17:23:20 +08:00
xieqiyu 3d7fd651db * Code for task#58567. 2022-06-28 16:11:40 +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
朱金勇 88e2ca8a01 Merge branch 'sprint/scx_tokenlogin' into 'master'
* Login action are recorded by default.

See merge request easycorp/zentaopms!4130
2022-06-24 07:42:01 +00:00