Commit Graph
985 Commits
Author SHA1 Message Date
朱金勇 6620381bc7 Merge branch 'sprint/scx_fixapibug' into 'master'
* Fix api bug.

See merge request easycorp/zentaopms!3871
2022-06-13 06:01:56 +00:00
宋辰轩 f798c853a7 * Fix api bug. 2022-06-10 16:22:46 +08:00
孙广明 448bec0032 Merge branch 'liyuchun_56556' into 'master'
Liyuchun 56556

See merge request easycorp/zentaopms!3826
2022-06-09 09:22:37 +00:00
liyuchun f1c720c4a0 * Finish task #56556. 2022-06-09 06:36:52 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +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
孙广明 f8d681efac * Fix bugs. 2022-06-06 13:54:06 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
zenggang c95c50021d * Adjust code 2022-06-02 05:33:38 +00:00
zenggang 982d1c72aa * Adjust code 2022-06-02 05:32:33 +00:00
zenggang fe5ec04749 * Code for task#55851 2022-06-02 05:22:12 +00:00
wangyidong 58e50c287c * code for task #55554. 2022-06-01 17:16:45 +08:00
liumengyi 873df65437 * Fix bug #50321. 2022-06-01 16:23:25 +08:00
hufangzhou 48b0d60744 * Fix bug #23058. 2022-05-30 10:26:37 +08:00
李玉春 2ae9a39642 Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22920.

See merge request easycorp/zentaopms!3598
2022-05-25 08:38:33 +00:00
liumengyi 5fad83c332 * Fix bug #22920. 2022-05-25 16:32:31 +08:00
孙广明 45398e9ac0 Merge branch 'sprint/192_leiyong_issue_647' into 'master'
* Issue 657 resolved.

See merge request easycorp/zentaopms!3587
2022-05-25 05:50:18 +00:00
liumengyi 39a163e0a8 * Fix bug for task #55254. 2022-05-24 16:04:10 +08:00
liumengyi 816999dbeb * Finish task #55254. 2022-05-24 14:41:42 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
leiyong 20aa8a673e * Issue 657 resolved. 2022-05-20 10:12:44 +00:00
wangyidong 2051f9a371 * code for bug #22577. 2022-05-20 10:56:23 +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
孙广明 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
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
liyuchun 4815a5e55d * Fix bug #22098. 2022-04-29 01:01:37 +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
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
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
孙广明 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
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