Commit Graph
3424 Commits
Author SHA1 Message Date
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋 e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
wangyidong 2051f9a371 * code for bug #22577. 2022-05-20 10:56:23 +08:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
leiyong b209e48e67 * Finish task#54489. 2022-05-20 01:43:32 +00:00
zhouxudong 86cb028806 * Finish task #54471. 2022-05-19 09:14:25 +00:00
zhouxudong 7ef420688e * Finish task #54471. 2022-05-19 07:53:07 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
李玉春 782e860754 Merge branch 'sprint/191_liumengyi_54349' into 'master'
Sprint/191 liumengyi 54349

See merge request easycorp/zentaopms!3455
2022-05-17 09:18:05 +00:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
孙广明 46e4eae295 * Finish task #54205. 2022-05-17 11:15:33 +08:00
孙广明 397930ac4e * Code for task #54189. 2022-05-17 08:56:07 +08:00
hufangzhou 5b20d429b4 * Fix the bug of login failed. 2022-05-16 09:03:13 +08:00
zhujinyong 9efef2692b + Add no-referrer. 2022-05-14 16:47:44 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
wangyuting2 dceb7ba183 * Optimize code. 2022-05-09 17:09:24 +08:00
wangyuting2 cc57fc819a * Add buildOperateMenu for bug module. 2022-05-09 11:16:14 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
liyuchun 4815a5e55d * Fix bug #22098. 2022-04-29 01:01:37 +00:00
tanghucheng a2c8d78177 * Fix bug . 2022-04-28 19:59:39 +08:00
王怡栋 a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
孙广明 8d8b999608 Merge branch 'fixbug_sunjun_17329' into 'master'
*Fixbug_sunjun_17329

See merge request easycorp/zentaopms!3188
2022-04-28 06:23:11 +00:00
sunjun 7f7f3013ea *Fixbug_sunjun_17329 2022-04-28 06:18:13 +00:00
caoyanyi 5fd5b34e97 * Modify check ip function. 2022-04-28 14:06:08 +08:00
caoyanyi d517513c69 * Fix bug #7006. 2022-04-28 14:03:33 +08:00
tanghucheng c04c165276 * Fix bug #21429. 2022-04-28 13:50:48 +08:00
lanzongjun cef78f131e * fix code format 2022-04-27 14:32:35 +08:00
lanzongjun 9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
wangyidong 23726bdb49 * adjust code. 2022-04-26 14:36:44 +08:00
李玉春 2aa57d045b Merge branch 'cyy_bug' into 'master'
* Fix unlink file error.

See merge request easycorp/zentaopms!3115
2022-04-26 03:11:42 +00:00
wangyidong f4e295ac8e * adjust for sso. 2022-04-26 09:51:55 +08:00
caoyanyi 2df290f018 * Fix bug #19311. 2022-04-26 09:04:11 +08:00
王怡栋 9d96c4d3ac Merge branch 'liyuchun_fixbug_7008' into 'master'
* Fix bug #7008.

See merge request easycorp/zentaopms!3071
2022-04-24 06:41:59 +00:00
Hao Sun abb3d4cf84 * refactor. 2022-04-22 17:12:20 +08:00
Hao Sun ea91c10200 * fix loop redirect in safari. 2022-04-22 17:11:12 +08:00
liyuchun 7cc557e528 * Fix bug #7008. 2022-04-22 09:01:32 +08:00
孙广明 ac0eb8c657 Merge branch 'liyuchun_fixbug_21632' into 'master'
* Fix bug #21632.

See merge request easycorp/zentaopms!3024
2022-04-21 01:22:29 +00:00
王怡栋 884c145ce2 Merge branch 'fixbug' into 'master'
* Fix bug #21846.

See merge request easycorp/zentaopms!3019
2022-04-21 00:44:21 +00:00
王怡栋 21c0fbb067 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 17:19:32 +08:00
王怡栋 54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
mayue 05639579e0 * Fix bug. 2022-04-20 17:02:32 +08:00
liyuchun 284af0ded1 * Fix bug #21632. 2022-04-20 11:02:29 +08:00
zenggang 217cc71960 * Fix bug#14478,19305 2022-04-19 09:21:02 +00:00
tanghucheng 1cd310f27a * Code for bug #21370. 2022-04-19 15:23:29 +08:00
zenggang b19b84e0c5 * Adjust code 2022-04-18 07:52:10 +00:00
zenggang 1c8c50724d * Fix bug#18642,21572 2022-04-18 07:25:46 +00:00
王怡栋 0d0fcb0c2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 11:30:31 +08:00
王怡栋 a481ba2959 * adjust for check priv. 2022-04-18 11:26:21 +08:00
hufangzhou a629ac2c12 * Fix bug #20062. 2022-04-15 15:22:58 +08:00
王怡栋 26f19a6085 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-15 11:20:54 +08:00