Commit Graph
3458 Commits
Author SHA1 Message Date
xieqiyu c03d486fab * Finish task#56919. 2022-06-14 15:55:48 +08:00
朱金勇 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
宋辰轩 328aea3be5 * Modify supportLang to defaultLang. 2022-06-07 10:56:42 +08:00
宋辰轩 d50f757397 * SupportLang. 2022-06-07 09:52:57 +08:00
孙广明 f8d681efac * Fix bugs. 2022-06-06 13:54:06 +08:00
孙广明 6446a75af5 * Change zentao license. 2022-06-02 16:32:59 +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
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08: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
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
hufangzhou 48b0d60744 * Fix bug #23058. 2022-05-30 10:26:37 +08:00
孙华伟 34b536605a Update action.html.php 2022-05-30 01:14:45 +00:00
孙华伟 dc2ba1c238 *Fix bug #22873. 2022-05-27 15:41:16 +08:00
孙广明 414dfc75c7 Merge branch 'sprint/193_leiyong_bug_22913' into 'master'
* Fix bug#22912.

See merge request easycorp/zentaopms!3602
2022-05-26 02:12:44 +00:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
leiyong 541e961882 * Fix bug#22912. 2022-05-26 01:50:41 +00: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
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
liumengyi 39a163e0a8 * Fix bug for task #55254. 2022-05-24 16:04:10 +08:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00: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
王怡栋 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