Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,618 Commits 2 Branches 292 Tags
e138da8508922eb92a2dc4bdac79670bca4ffbd7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 4f9388e5e6 Merge branch 'sprint/sunhao/optimize_program_list' into 'master' 
* fix table with nested option not work as expected.

See merge request easycorp/zentaopms!4013
 2022-06-17 15:24:25 +00:00
孙广明 6ff93fcc13 Merge branch 'sprint/sunhao/optimize_program_list' into 'master' 
* optimize program list, support to preserve nested state.

See merge request easycorp/zentaopms!4010
 2022-06-17 08:06:58 +00:00
孙广明 642b518397 Merge branch 'codeReview' into 'master' 
codeReview

See merge request easycorp/zentaopms!4004
 2022-06-17 07:11:23 +00:00
孙广明 960ce0c856 Merge branch 'sprint/204_tianshujie_23918' into 'master' 
* Fix bug #23918.

See merge request easycorp/zentaopms!4009
 2022-06-17 07:00:20 +00:00
孙广明 998064caf0 Merge branch 'sprint/203_mayue_bug#23868' into 'master' 
* Fix bug #23868.

See merge request easycorp/zentaopms!4008
 2022-06-17 06:56:27 +00:00
孙广明 16dd9ad238 Merge branch 'sprint/fixbug_liumengyi' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!4007
 2022-06-17 06:21:22 +00:00
孙广明 6d815e5c33 Merge branch 'sprint202_leiyong_fix_bug_23874' into 'master' 
* Adjust CSS.

See merge request easycorp/zentaopms!4006
 2022-06-17 06:15:47 +00:00
孙广明 0a00dfe217 Merge branch 'sprint/203_mayue_bug#23865#23869' into 'master' 
* Fix bug #23865#23869.

See merge request easycorp/zentaopms!4000
 2022-06-17 06:15:36 +00:00
孙广明 b345f5510c Merge branch 'sprint/tianshujie_modifyTip' into 'master' 
* Modify Modify program prompt when editing a product.

See merge request easycorp/zentaopms!3996
 2022-06-17 05:17:41 +00:00
孙广明 b52ef1c426 Merge branch 'sprint/204_tianshujie_optimize' into 'master' 
* Optimize the code.

See merge request easycorp/zentaopms!4005
 2022-06-17 05:16:52 +00:00
孙广明 2ee46ee784 Merge branch 'sprint/tianshujie' into 'master' 
* Modify Edit logic for switching program.

See merge request easycorp/zentaopms!4002
 2022-06-17 03:52:40 +00:00
孙广明 d839f8551e Merge branch 'sgm_fixbug' into 'master' 
* Code for zentao license.

See merge request easycorp/zentaopms!3999
 2022-06-17 03:11:57 +00:00
孙广明 1bc6b260a5 Merge branch 'liyuchun_api' into 'master' 
Remove unused code.

See merge request easycorp/zentaopms!3988
 2022-06-17 00:35:37 +00:00
孙广明 3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master' 
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
 2022-06-16 09:28:33 +00:00
孙广明 8002199638 Merge branch 'sprint/tianshujie' into 'master' 
* Delete useless code.

See merge request easycorp/zentaopms!3993
 2022-06-16 09:24:01 +00:00
孙广明 45cb7876dc Merge branch 'sprint/tianshujie' into 'master' 
* If the project linked with the product belongs to the changed program, the...

See merge request easycorp/zentaopms!3991
 2022-06-16 09:19:18 +00:00
孙广明 bb337fdc9c Merge branch 'fixbug_php' into 'master' 
fixbug_php

See merge request easycorp/zentaopms!3990
 2022-06-16 09:14:22 +00:00
孙广明 1ca935f2b4 Merge branch 'sgm_fixbug' into 'master' 
* Change product browse order btn.

See merge request easycorp/zentaopms!3987
 2022-06-16 08:53:44 +00:00
孙广明 3c35bd84ea Merge branch 'sprint/201_tianshujie_23855' into 'master' 
* Fix bug #23855.

See merge request easycorp/zentaopms!3980
 2022-06-16 08:37:23 +00:00
孙广明 8668cd9fd1 Merge branch 'sprint/203_mayue_bug#23183' into 'master' 
* Fix bug #23183.

See merge request easycorp/zentaopms!3984
 2022-06-16 08:35:39 +00:00
孙广明 42370ae0c5 Merge branch 'sprint/203_mayue_bug#23682' into 'master' 
* Fix bug #23682.

See merge request easycorp/zentaopms!3985
 2022-06-16 08:33:41 +00:00
孙广明 dfb9cddc6a Merge branch 'fixissue_planIcon' into 'master' 
fixissue_planIcon

See merge request easycorp/zentaopms!3983
 2022-06-16 08:06:49 +00:00
孙广明 7383076af1 Merge branch 'sgm_fixbug' into 'master' 
* Finsih task #57157.

See merge request easycorp/zentaopms!3978
 2022-06-16 06:56:04 +00:00
孙广明 3a1d6a8982 Merge branch 'fixbug_23694' into 'master' 
fixbug_23694

See merge request easycorp/zentaopms!3971
 2022-06-16 06:36:28 +00:00
孙广明 e0764d4248 Merge branch 'fixbug_sunjun_23810' into 'master' 
Fixbug sunjun 23810

See merge request easycorp/zentaopms!3977
 2022-06-16 06:36:10 +00:00
孙广明 a0a5a6e9cb Merge branch 'sprint/204_liumengyi_678' into 'master' 
* Fix issue #678.

See merge request easycorp/zentaopms!3975
 2022-06-16 06:22:22 +00:00
孙广明 bfa7047dff Merge branch 'sgm_fixbug' into 'master' 
Sgm fixbug

See merge request easycorp/zentaopms!3970
 2022-06-16 05:17:36 +00:00
孙广明 7e6920ccd4 Merge branch 'master_xieqiyu_56936' into 'master' 
* Fix bug#56936.

See merge request easycorp/zentaopms!3965
 2022-06-16 03:15:51 +00:00
孙广明 1315cf7ea8 Merge branch 'sgm_details' into 'master' 
Sgm details

See merge request easycorp/zentaopms!3963
 2022-06-16 02:48:43 +00:00
孙广明 8db0b61c87 Merge branch 'sprint_204_57091' into 'master' 
Sprint 204 57091

See merge request easycorp/zentaopms!3948
 2022-06-16 00:28:26 +00:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095' 
# Conflicts:
#   module/execution/css/all.css
 2022-06-15 09:03:47 +00:00
孙广明 b5d1401b88 Merge branch 'liyuchun_bug' into 'master' 
* Fix error.

See merge request easycorp/zentaopms!3943
 2022-06-15 08:25:04 +00:00
孙广明 9500b44b17 Merge branch 'fixbug_23668' into 'master' 
* Fix bug #23668.

See merge request easycorp/zentaopms!3938
 2022-06-15 07:20:13 +00:00
孙广明 97d6c0bca9 Merge branch 'sprint/204_liumengyi_57089' into 'master' 
* Fix bug #23744.

See merge request easycorp/zentaopms!3935
 2022-06-15 07:19:56 +00:00
孙广明 461862e284 Merge branch 'sprint/203_mayue_task#57393' into 'master' 
* Finish task #57393.

See merge request easycorp/zentaopms!3937
 2022-06-15 07:15:59 +00:00
孙广明 80a39e398d Merge branch 'sprint/204_liumengyi_57089' into 'master' 
* Fix bug #23738.

See merge request easycorp/zentaopms!3930
 2022-06-15 05:27:13 +00:00
孙广明 9df2853a61 Merge branch 'sprint_204_57094' into 'master' 
Sprint 204 57094

See merge request easycorp/zentaopms!3928
 2022-06-15 03:09:37 +00:00
孙广明 6656dd71a5 Merge branch 'sprint_204_57093' into 'master' 
Sprint 204 57093

See merge request easycorp/zentaopms!3919
 2022-06-15 03:09:10 +00:00
孙广明 7ef456bb6b Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of program list in normal user.

See merge request easycorp/zentaopms!3926
 2022-06-15 02:08:42 +00:00
孙广明 423bd7b9b9 Merge branch 'sprint/203_mayue_bug#23586' into 'master' 
* Fix bug #23586.

See merge request easycorp/zentaopms!3924
 2022-06-15 01:08:50 +00:00
孙广明 271d1b1a3b Merge branch 'sprint_204_57097' into 'master' 
sprint_204_57097

See merge request easycorp/zentaopms!3920
 2022-06-14 09:09:41 +00:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master' 
* Finish task#56558

See merge request easycorp/zentaopms!3892
 2022-06-14 06:58:39 +00:00
孙广明 7d37afcd4f Merge branch 'sprint/203_zg_57156' into 'master' 
* Finish task#57156,57159

See merge request easycorp/zentaopms!3905
 2022-06-14 06:58:22 +00:00
孙广明 0397a7b0b5 Merge branch 'sprint/203_mayue_bug#23410' into 'master' 
* Fix bug #23410.

See merge request easycorp/zentaopms!3897
 2022-06-14 05:35:39 +00:00
孙广明 a9a75958c7 Merge branch 'sgm_57157' into 'master' 
* Finish task #57157.

See merge request easycorp/zentaopms!3896
 2022-06-14 02:49:49 +00:00
孙广明 d9e036ba0c Merge branch 'sgm_56629' into 'master' 
* Add en lang.

See merge request easycorp/zentaopms!3894
 2022-06-14 02:26:04 +00:00
孙广明 5c1f32c3d9 Merge branch 'sprint_194' into 'master' 
sprint_194 add project in batchcreate view

See merge request easycorp/zentaopms!3876
 2022-06-13 02:06:00 +00:00
孙广明 5568901e92 Merge branch 'zhouxin_bugtotask' into 'master' 
* Finish task #55258.

See merge request easycorp/zentaopms!3875
 2022-06-13 01:45:35 +00:00
孙广明 a42ef81a50 Merge branch 'fixbug_sunjun_23572' into 'master' 
fixbug_sunjun_23572

See merge request easycorp/zentaopms!3874
 2022-06-13 00:54:52 +00:00
孙广明 3a75fa0ad8 Merge branch 'sprint/199_mayue_bug#22928' into 'master' 
* Fix bug #22928.

See merge request easycorp/zentaopms!3868
 2022-06-13 00:52:59 +00:00
孙广明 49f25c80e5 Merge branch 'sprint200_leiyong_adjust_style' into 'master' 
* Adjust style.

See merge request easycorp/zentaopms!3864
 2022-06-10 07:57:20 +00:00
孙广明 7f9e775486 Merge branch '201_zhouxin_bugs' into 'master' 
* Fix bug #56479.

See merge request easycorp/zentaopms!3866
 2022-06-10 07:55:11 +00:00
孙广明 54bb4ccdcc Merge branch 'sprint/201_tianshujie_fixbug' into 'master' 
* Fix bug #23573.

See merge request easycorp/zentaopms!3865
 2022-06-10 07:17:05 +00:00
孙广明 d282416028 Merge branch 'fixbug_requirement' into 'master' 
fixbug_requirement

See merge request easycorp/zentaopms!3863
 2022-06-10 06:18:18 +00:00
孙广明 4106203a4b Merge branch 'sprint_sunjun_201' into 'master' 
sprint_sunjun_201

See merge request easycorp/zentaopms!3860
 2022-06-10 04:32:37 +00:00
孙广明 23ae4cea1c Merge branch 'master_xieqiyu_56376' into 'master' 
* Finish task#56376.

See merge request easycorp/zentaopms!3859
 2022-06-10 04:29:59 +00:00
孙广明 32aaa90fd0 Merge branch 'sprint/201_liumengyi_23561' into 'master' 
* Fix bug #23561.

See merge request easycorp/zentaopms!3858
 2022-06-10 03:55:11 +00:00
孙广明 2363290d9a Merge branch '199_mayue_task56550,56553' into 'master' 
* Ajust mutual test issue.

See merge request easycorp/zentaopms!3852
 2022-06-10 02:31:18 +00:00
孙广明 6d78419e2b Merge branch 'sprint/201_liumengyi_23423' into 'master' 
* Fix bug #23423.

See merge request easycorp/zentaopms!3851
 2022-06-10 02:20:27 +00:00
孙广明 4e40722b6d Merge branch 'sprint/199_mayue_task56550,56553' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!3845
 2022-06-10 01:08:31 +00:00
孙广明 45d130f354 Merge branch 'sprint199_zg' into 'master' 
* Finish task#56549,56552

See merge request easycorp/zentaopms!3842
 2022-06-10 01:03:54 +00:00
孙广明 0d4fe6983d Merge branch 'sprint200_adjust_style' into 'master' 
* Adjust style.

See merge request easycorp/zentaopms!3841
 2022-06-10 01:02:20 +00:00
孙广明 4d07a2d45b Merge branch 'sprint/199_mayue_task56550,56553' into 'master' 
* Finish task #56550,56553.

See merge request easycorp/zentaopms!3840
 2022-06-10 01:02:07 +00:00
孙广明 448bec0032 Merge branch 'liyuchun_56556' into 'master' 
Liyuchun 56556

See merge request easycorp/zentaopms!3826
 2022-06-09 09:22:37 +00:00
孙广明 25a79b513b Merge branch 'sprint/hufangzhou_productOrder' into 'master' 
* Make the order of products in the product drop-down consistent with the product list.

See merge request easycorp/zentaopms!3836
 2022-06-09 09:22:27 +00:00
孙广明 f02350122a Merge branch 'liyuchun_56551' into 'master' 
Liyuchun 56551

See merge request easycorp/zentaopms!3822
 2022-06-09 09:21:32 +00:00
孙广明 d3afbb5922 Merge branch 'sprint/201_liumengyi_fixbug' into 'master' 
* Fix bug #23506, #23439.

See merge request easycorp/zentaopms!3835
 2022-06-09 08:26:54 +00:00
孙广明 06768fb562 Merge branch 'sprint/scx_api' into 'master' 
* Fix create user bug.

See merge request easycorp/zentaopms!3823
 2022-06-09 06:31:14 +00:00
孙广明 f3f8e20c9b Merge branch 'sprint/201_zhouxin_my_work' into 'master' 
* Finish task #56461,56462,56458,56465.

See merge request easycorp/zentaopms!3819
 2022-06-09 05:23:01 +00:00
孙广明 1c2f7d9527 Merge branch 'sprint_200_fix_bug' into 'master' 
* Fix bug#23481,bug#23466.

See merge request easycorp/zentaopms!3818
 2022-06-09 05:11:02 +00:00
孙广明 ea2fe3e532 Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200' 
Sprint200 leiyong task 56378

See merge request easycorp/zentaopms!3801
 2022-06-09 02:40:35 +00:00
孙广明 5ba7ac7d8b Merge branch 'sprint/199_mayue_story#9206' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3807
 2022-06-09 01:30:53 +00:00
孙广明 9d477cc0cf Merge branch 'master' into 'liyuchun_56551' 
# Conflicts:
#   db/update17.0.sql
 2022-06-09 01:30:08 +00:00
孙广明 cfb3814e86 Merge branch 'sprint_201_56468' into 'master' 
sprint_201_56468

See merge request easycorp/zentaopms!3806
 2022-06-09 01:29:18 +00:00
孙广明 3092800655 Merge branch 'sprint/199_zg_56544' into 'master' 
* Finish task#56544

See merge request easycorp/zentaopms!3791
 2022-06-09 01:19:51 +00:00
孙广明 3ecf2469bf Merge branch 'master' into 'sgm_review' 
# Conflicts:
#   db/update17.0.sql
 2022-06-09 01:14:10 +00:00
孙广明 07591cfd0f Merge branch 'sprint_201_56459' into 'master' 
Sprint 201 56459

See merge request easycorp/zentaopms!3802
 2022-06-09 00:35:28 +00:00
孙广明 20532c7756 Merge branch 'sprint/200_zhouxudong_56381' into 'sprint_200' 
* Finish task #56381.

See merge request easycorp/zentaopms!3778
 2022-06-08 07:52:54 +00:00
孙广明 a3cf2ab2b4 Merge branch 'sprint200_leiyong_task_56387' into 'sprint_200' 
* Finish task#56387.

See merge request easycorp/zentaopms!3775
 2022-06-08 07:44:47 +00:00
孙广明 cb4776df2d Merge branch 'sprint/200_zhouxudong_56379' into 'master' 
Sprint/200 zhouxudong 56379

See merge request easycorp/zentaopms!3785
 2022-06-08 06:46:21 +00:00
孙广明 dda429d7e7 Merge branch 'sprint/199_mayue_story#9206' into 'master' 
* Finish story#9206.

See merge request easycorp/zentaopms!3792
 2022-06-08 06:43:33 +00:00
孙广明 0c0af6336a Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200' 
Sprint/master zhouxudong 23026

See merge request easycorp/zentaopms!3777
 2022-06-08 06:37:32 +00:00
孙广明 e5fd2a3684 Merge branch 'sprint/200_sunhao/task56385' into 'sprint_200' 
* task #56385, update theme 'blue', optimize active button style.

See merge request easycorp/zentaopms!3787
 2022-06-08 06:22:02 +00:00
孙广明 d1c824509c Merge branch 'sprint/tianshujie_23349' into 'master' 
* Fix bug #23349.

See merge request easycorp/zentaopms!3772
 2022-06-07 08:01:45 +00:00
孙广明 e26d40da04 Merge branch 'sprint/200_zhouxudong_56363' into 'sprint_200' 
* Finish task #56363.

See merge request easycorp/zentaopms!3771
 2022-06-07 07:22:15 +00:00
孙广明 5281be0b32 Merge branch 'sprint/scx_header' into 'master' 
* SupportLang.

See merge request easycorp/zentaopms!3763
 2022-06-07 06:51:54 +00:00
孙广明 06f1bc6dff Merge branch 'sprint/sunhao/bug23284' into 'master' 
* bug #23284, fix simplemde error.

See merge request easycorp/zentaopms!3765
 2022-06-07 06:50:09 +00:00
孙广明 6b9c4f9deb Merge branch 'sprint/fixbug_liumengyi_23271' into 'master' 
* Fix bug #23271.

See merge request easycorp/zentaopms!3756
 2022-06-06 08:50:48 +00:00
孙广明 05fad2dfbb Merge branch 'sprint/fixbug_liumengyi_23290' into 'master' 
* Fix bug #23290.

See merge request easycorp/zentaopms!3753
 2022-06-06 08:50:26 +00:00
孙广明 284a43c780 Merge branch 'fix_bug#23320' into 'master' 
* Fix bug #23320.

See merge request easycorp/zentaopms!3755
 2022-06-06 08:35:03 +00:00
孙广明 4faa6d598d Merge branch 'sprint/tianshujie_bug23113' into 'master' 
* Fix bug #23113.

See merge request easycorp/zentaopms!3754
 2022-06-06 08:34:27 +00:00
孙广明 a5ebd1f530 Merge branch 'sprint/197_liumengyi_upgrade' into 'master' 
* Optimize code of task #55677.

See merge request easycorp/zentaopms!3745
 2022-06-06 06:24:27 +00:00
孙广明 7a9d13b62c Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #23289.

See merge request easycorp/zentaopms!3742
 2022-06-06 06:07:50 +00:00
孙广明 a05910ea9c Merge branch 'sprint/197_liumengyi_upgrade' into 'master' 
* Add upgrade function of task #55677.

See merge request easycorp/zentaopms!3740
 2022-06-06 05:43:40 +00:00
孙广明 352cb8adf2 Merge branch 'zg_23246' into 'master' 
* Fix bug#23246

See merge request easycorp/zentaopms!3738
 2022-06-06 05:04:26 +00:00
孙广明 5468fe8ee5 Merge branch 'master_xieqiyu_23242' into 'master' 
* Fix bug#23242.

See merge request easycorp/zentaopms!3733
 2022-06-06 01:53:54 +00:00
孙广明 82f09dcb51 Merge branch 'master_xieqiyu_23154' into 'master' 
* Fix bug#23154.

See merge request easycorp/zentaopms!3731
 2022-06-02 09:43:11 +00:00
孙广明 f14516b7b1 Merge branch 'sprint/liumengyi_fixbug' into 'master' 
* Fix bug #23236.

See merge request easycorp/zentaopms!3730
 2022-06-02 09:10:49 +00:00
孙广明 0a68d0b6fb Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #23230.

See merge request easycorp/zentaopms!3728
 2022-06-02 08:37:04 +00:00
孙广明 c6c1ce36a4 Merge branch 'autotest_ly' into 'master' 
update data by table project

See merge request easycorp/zentaopms!3724
 2022-06-02 08:05:12 +00:00