Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,160 Commits 2 Branches 292 Tags
097faf3c7d59fd85bcbabc8e7d10e4f34ec0c776
Commit Graph
40160 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 097faf3c7d Merge branch 'sprint/master_zhouxudong_56374' into 'master' 
Sprint/master zhouxudong 56374

See merge request easycorp/zentaopms!3849
 2022-06-10 02:01:58 +00:00
王怡栋 0f022766e3 Merge branch 'sgm_effortsql' into 'master' 
* Finish task #56545.

See merge request easycorp/zentaopms!3848
 2022-06-10 02:01:15 +00:00
王怡栋 74554fe0bb Merge branch 'sprint200_leiyong_task_56370' into 'master' 
Sprint200 leiyong task 56370

See merge request easycorp/zentaopms!3847
 2022-06-10 01:51:28 +00:00
孙广明 212fb344c3 * Finish task #56545. 2022-06-10 09:44:48 +08:00
zhouxudong 82afc7ae76 * Finish task #56374. 2022-06-10 01:43:08 +00:00
leiyong 82caa7ee4d * Fix bug#23542. 2022-06-10 01:36:47 +00:00
王怡栋 4eff0d7532 Merge branch 'sprint/201_tianshujie_fixbug' into 'master' 
Sprint/201 tianshujie fixbug

See merge request easycorp/zentaopms!3846
 2022-06-10 01:33:29 +00:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
leiyong 3f03e8cb4a * Finish task#56370. 2022-06-10 01:32:01 +00:00
tianshujie 01c135440b * Fix bug #23455. 2022-06-10 09:31:44 +08:00
tianshujie 6825ac20c4 * Fix bug #23421. 2022-06-10 09:31:00 +08:00
tianshujie baff0cf4fe * Optimize code. 2022-06-10 09:23:12 +08:00
tianshujie 3f1dc22664 * Finish task #56469. 2022-06-10 09:22:50 +08: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
王怡栋 fad3f54c7b Merge branch 'sprint/201_tianshujie_56460' into 'master' 
* Finish task #56460.

See merge request easycorp/zentaopms!3844
 2022-06-10 01:07:17 +00:00
wangyidong 08f2b93399 Merge branch 'sprint/201_tianshujie_56469' 2022-06-10 09:06:30 +08:00
王怡栋 a9981b0a33 Merge branch 'master' into 'sprint/201_tianshujie_56469' 
# Conflicts:
#   module/execution/control.php
#   module/execution/js/kanban.js
#   module/kanban/control.php
#   module/kanban/model.php
 2022-06-10 01:05:39 +00:00
mayue a08bd00371 * Optimize code. 2022-06-10 09:05:33 +08: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
zenggang 8c5c2f2149 * Finish task#56549,56552 2022-06-10 00:51:11 +00:00
tianshujie b8792fcb90 * Finish task #56469. 2022-06-10 08:35:22 +08:00
liumengyi a5d2a87fdf * Finish task #56469. 2022-06-09 17:33:46 +08:00
leiyong 70c1b06e1c * Adjust code. 2022-06-09 09:31:45 +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
王怡栋 7d3ea4b91e Merge branch 'sprint200_fix_bug_23486' into 'master' 
* Fix bug#23494,bug#23486.

See merge request easycorp/zentaopms!3839
 2022-06-09 09:17:19 +00:00
王怡栋 a49725905a Merge branch 'fixbug' into 'master' 
* Fix bug #23228.

See merge request easycorp/zentaopms!3837
 2022-06-09 09:16:46 +00:00
mayue edda32ba72 * Finish task #56550,56553. 2022-06-09 17:15:44 +08:00
李玉春 3cd9b94ecb Merge branch 'cyy_56548' into 'master' 
* Modify task import.

See merge request easycorp/zentaopms!3834
 2022-06-09 09:13:47 +00:00
李玉春 fa152a30c8 Merge branch '201_zhouxin_fixbug' into 'master' 
* Fix bug for task #56458.

See merge request easycorp/zentaopms!3838
 2022-06-09 09:13:26 +00:00
zhouxin 367ed5c190 * Adjust code. 2022-06-09 08:59:56 +00:00
leiyong 4d5ccc180e * Fix bug#23494,bug#23486. 2022-06-09 08:58:05 +00:00
zhouxin 5500e2fb58 * Fix bug for task #56458. 2022-06-09 08:54:56 +00:00
wangyidong 9b699300ff * code for bug #23516. 2022-06-09 16:50:07 +08:00
tanghucheng 72d05c14df * Fix bug #23228. 2022-06-09 16:40:16 +08: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
hufangzhou 4385eab733 * Make the order of products in the product drop-down consistent with the product list. 2022-06-09 16:25:29 +08:00
liumengyi f3ce4377a8 * Fix bug #23506, #23439. 2022-06-09 16:22:58 +08:00
wangyidong e407b58e2a * adjust for get lang api. 2022-06-09 16:02:35 +08:00
caoyanyi 861a695535 * Modify task import. 2022-06-09 15:54:16 +08:00
李玉春 227586f566 Merge branch 'cyy_56548' into 'master' 
* Modify access check.

See merge request easycorp/zentaopms!3833
 2022-06-09 07:48:59 +00:00
caoyanyi 6a93732c19 * Modify access check. 2022-06-09 15:47:28 +08:00
wangyidong 4606a9eb2e Merge branch 'sprint200_leiyong_task_56384' 2022-06-09 15:40:40 +08:00
王怡栋 c9a29bb420 Merge branch 'master' into 'sprint200_leiyong_task_56384' 
# Conflicts:
#   module/kanban/view/space.html.php
 2022-06-09 07:40:03 +00:00
李玉春 f8581fd2c4 Merge branch 'zentaopms_199' into 'master' 
Zentaopms 199

See merge request easycorp/zentaopms!3832
 2022-06-09 07:38:52 +00:00
leiyong 1b511cac59 * Handling html tags. 2022-06-09 07:33:00 +00:00
王怡栋 95fa3f04e1 Merge branch 'fixbug' into 'master' 
* Fix bug #23474,23474,23441,23374.

See merge request easycorp/zentaopms!3830
 2022-06-09 07:25:39 +00:00