Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,558 Commits 2 Branches 292 Tags
9d2ac6ff703a539078afb1046576cf8cad181929
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 9d2ac6ff70 Merge branch 'fixbug_sunjun_20372' into 'master' 
*Fixbug #20372

See merge request easycorp/zentaopms!2652
 2022-03-31 00:33:19 +00:00
李玉春 7dbf565a76 Merge branch 'fixbug_sunjun_19687' into 'master' 
Fixbug sunjun 19687

See merge request easycorp/zentaopms!2644
 2022-03-31 00:24:37 +00:00
李玉春 a680dd14e7 Merge branch 'cyy_fixbug' into 'master' 
* Fix bug #6971.

See merge request easycorp/zentaopms!2638
 2022-03-30 09:12:48 +00:00
李玉春 43f8dd4638 Merge branch 'sunhuawei_fixbug_21183' into 'master' 
*Fix bug#21183.

See merge request easycorp/zentaopms!2634
 2022-03-30 07:15:35 +00:00
李玉春 aa95cdd7ef Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of check iframe.

See merge request easycorp/zentaopms!2635
 2022-03-30 06:50:06 +00:00
李玉春 d0d33aa277 Merge branch 'devops24_51117' into 'master' 
Finish task#51117

See merge request easycorp/zentaopms!2629
 2022-03-30 06:07:52 +00:00
李玉春 c83e0de8c7 Merge branch 'master_xieqiyu_21283' into 'master' 
* Fix bug#21283.

See merge request easycorp/zentaopms!2630
 2022-03-30 03:18:12 +00:00
李玉春 9b82ef6e78 Merge branch 'sprint/tianshujie_bug21282' into 'master' 
* Fix bug #21282.

See merge request easycorp/zentaopms!2628
 2022-03-30 03:04:20 +00:00
李玉春 3f292c2d80 Merge branch 'sunhuawei_fixbug_16677' into 'master' 
*Fix bug#16677.

See merge request easycorp/zentaopms!2621
 2022-03-30 02:20:52 +00:00
李玉春 bb121a405a Merge branch 'devops23_21095' into 'master' 
Fix bug#21095,21093

See merge request easycorp/zentaopms!2625
 2022-03-30 01:05:29 +00:00
李玉春 8ba2c1bb83 Merge branch 'sunhuawei_fixbug_16679' into 'master' 
*Fix bug#16679

See merge request easycorp/zentaopms!2616
 2022-03-29 08:13:59 +00:00
李玉春 405d75736f Merge branch 'cyy_app' into 'master' 
* Add return for file upload size.

See merge request easycorp/zentaopms!2611
 2022-03-29 07:50:22 +00:00
李玉春 3342320ff0 Merge branch 'sprint/tianshujie_bug16101' into 'master' 
Sprint/tianshujie bug16101

See merge request easycorp/zentaopms!2612
 2022-03-29 07:47:51 +00:00
李玉春 4d28e9772d Merge branch 'devops24_21092' into 'master' 
Fix bug#21092

See merge request easycorp/zentaopms!2600
 2022-03-29 06:19:09 +00:00
李玉春 8b24143995 Merge branch 'fixbug_sunjun_21258' into 'master' 
*Fixbug #21258

See merge request easycorp/zentaopms!2606
 2022-03-29 05:54:21 +00:00
李玉春 91b8835642 Merge branch 'sprint/tianshujie_bug21028' into 'master' 
Sprint/tianshujie bug21028

See merge request easycorp/zentaopms!2605
 2022-03-29 03:30:23 +00:00
李玉春 a2da8e12f0 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2597
 2022-03-29 01:12:21 +00:00
李玉春 b26b17ca35 Merge branch 'cyy_11655' into 'master' 
* Fix bug #11655 and add repo create check.

See merge request easycorp/zentaopms!2590
 2022-03-29 00:54:42 +00:00
李玉春 146d424c25 Merge branch 'devops24_51178' into 'master' 
Finish task#51178

See merge request easycorp/zentaopms!2586
 2022-03-29 00:52:51 +00:00
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master' 
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
 2022-03-29 00:50:37 +00:00
李玉春 e6319bec6d Merge branch 'sunhuawei_fixbug_14756' into 'master' 
*Fix bug#14756.

See merge request easycorp/zentaopms!2592
 2022-03-28 08:58:57 +00:00
李玉春 b87ce16ef3 Merge branch 'mayue_fix_bug_#18310' into 'master' 
* Fix bug #18310.

See merge request easycorp/zentaopms!2567
 2022-03-28 08:55:16 +00:00
李玉春 382e4493f1 Merge branch 'sprint/master_zhouxudong_11919' into 'master' 
Sprint/master zhouxudong 11919

See merge request easycorp/zentaopms!2582
 2022-03-28 08:12:30 +00:00
李玉春 d726d5bfbb Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2574
 2022-03-28 05:10:26 +00:00
李玉春 a3b7732866 Merge branch 'sprint/scx_fixapibug' into 'master' 
*Fix api bug.

See merge request easycorp/zentaopms!2568
 2022-03-28 03:17:03 +00:00
李玉春 c6e89fc7c1 Merge branch 'fixbug_cyy' into 'master' 
* Fix bug #20156.

See merge request easycorp/zentaopms!2570
 2022-03-28 03:16:18 +00:00
李玉春 b9e4882cd8 Merge branch 'devops24_51139' into 'master' 
Finish task#51139

See merge request easycorp/zentaopms!2560
 2022-03-28 03:13:31 +00:00
李玉春 a04046f4b2 Merge branch 'mayue_optimizeCode' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!2571
 2022-03-28 02:59:37 +00:00
李玉春 0a6130a20b Merge branch 'sunhuawei_fixbug_21124' into 'master' 
*Fix bug#21124.

See merge request easycorp/zentaopms!2572
 2022-03-28 02:59:07 +00:00
李玉春 7e0cf1500e Merge branch 'fixbug_cyy' into 'master' 
* Fix bug #19745.

See merge request easycorp/zentaopms!2555
 2022-03-28 00:38:56 +00:00
李玉春 5d0e802a49 Merge branch 'devops24_51136' into 'master' 
Finish task#51136

See merge request easycorp/zentaopms!2554
 2022-03-25 09:35:43 +00:00
李玉春 f481b0fd9a Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2550
 2022-03-25 07:11:11 +00:00
李玉春 31c97d51c6 Merge branch 'mayue_optimize_code' into 'master' 
* Handling PHP compatibility issues.

See merge request easycorp/zentaopms!2536
 2022-03-25 03:06:59 +00:00
李玉春 016fef8ec6 Merge branch 'devops24_51104' into 'master' 
Finish task#51104

See merge request easycorp/zentaopms!2530
 2022-03-25 03:02:57 +00:00
李玉春 c0ebf6480e Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2534
 2022-03-25 03:00:00 +00:00
李玉春 de4406ba83 Merge branch 'sprint/master_zhouxudong_16718' into 'master' 
Fix bug #16718.

See merge request easycorp/zentaopms!2525
 2022-03-25 00:59:10 +00:00
李玉春 169fa0c19e Merge branch 'mayue_fix_bug#13804' into 'master' 
* Fix bug #13804.

See merge request easycorp/zentaopms!2520
 2022-03-24 09:21:04 +00:00
李玉春 eef0da7fd0 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2517
 2022-03-24 09:16:36 +00:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master' 
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
 2022-03-24 07:45:13 +00:00
李玉春 43d834e01d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2513
 2022-03-24 07:44:23 +00:00
李玉春 ca3b8a3927 Merge branch 'sprint/sunhao/optimize_kanban' into 'master' 
* optimize UI for kanban and fix drop rules not work.

See merge request easycorp/zentaopms!2511
 2022-03-24 06:44:07 +00:00
李玉春 defd9faa28 Merge branch 'sunhuawei_fixbug_13935' into 'master' 
*Fix bug#13935

See merge request easycorp/zentaopms!2505
 2022-03-24 06:35:13 +00:00
李玉春 939d7664ff Merge branch 'sprint/sunhao/optimize_kanban' into 'master' 
* fix issue for drag-and-drop cards in kanban.

See merge request easycorp/zentaopms!2497
 2022-03-24 02:41:19 +00:00
李玉春 c458dab32a Merge branch 'sprint/tianshujie_bug_19072' into 'master' 
Sprint/tianshujie bug 19072

See merge request easycorp/zentaopms!2496
 2022-03-24 02:40:57 +00:00
李玉春 bd6bf93aaa Merge branch 'cyy_bug' into 'master' 
* Modify config get.

See merge request easycorp/zentaopms!2492
 2022-03-24 01:03:35 +00:00
李玉春 6729298c92 Merge branch 'bugfix_cyy' into 'master' 
Modify app language and API

See merge request easycorp/zentaopms!2488
 2022-03-24 00:29:54 +00:00
李玉春 21a6de6681 Merge branch 'devops24_zenggang' into 'master' 
Finish task#51109,51108,51128

See merge request easycorp/zentaopms!2486
 2022-03-23 08:31:17 +00:00
李玉春 2440d793e0 Merge branch 'sprint/zenops24_lwr_tweak_xuan_web_client' into 'master' 
Tweak xuan web client.

See merge request easycorp/zentaopms!2475
 2022-03-23 06:17:15 +00:00
李玉春 19363cc6bf Merge branch 'sprint/tianshujie_20653' into 'master' 
* Fix bug #20653.

See merge request easycorp/zentaopms!2477
 2022-03-23 06:16:36 +00:00
李玉春 14d8417580 Merge branch 'sprint/master_zhouxudong_17053' into 'master' 
* Fix bug #17053.

See merge request easycorp/zentaopms!2473
 2022-03-23 05:34:22 +00:00
李玉春 8992b0acca Merge branch 'master' into 'fixbug_cyy' 
# Conflicts:
#   module/install/model.php
 2022-03-23 05:04:41 +00:00
李玉春 1cb7e1a05f Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2468
 2022-03-23 03:30:58 +00:00
李玉春 a9cb7525f2 Merge branch 'sprint/scx_recordDemandEstimate' into 'master' 
*Fix record task estimate bug.

See merge request easycorp/zentaopms!2470
 2022-03-23 03:30:22 +00:00
李玉春 64e9667a1f Merge branch 'sprint/master_zhouxudong_16718' into 'master' 
* Fix bug #16718.

See merge request easycorp/zentaopms!2458
 2022-03-22 08:55:17 +00:00
李玉春 26f84d495d Merge branch 'sprint/master_zhouxudong_16575' into 'master' 
Sprint/master zhouxudong 16575

See merge request easycorp/zentaopms!2453
 2022-03-22 08:18:36 +00:00
李玉春 56e4317e23 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2447
 2022-03-22 07:55:27 +00:00
李玉春 fc22ac4658 Merge branch 'sunhuawei_fixbug_17397' into 'master' 
*Fix bug#17397

See merge request easycorp/zentaopms!2446
 2022-03-22 07:54:59 +00:00
李玉春 9adf7324da Merge branch 'devops24_zenggang' into 'master' 
Finish task#51115,51116,51120,51121,51133

See merge request easycorp/zentaopms!2445
 2022-03-22 07:44:42 +00:00
李玉春 f7b4ea2ac6 Merge branch 'sprint/master_zhouxudong_16070' into 'master' 
* Fix bug #16070.

See merge request easycorp/zentaopms!2443
 2022-03-22 06:55:47 +00:00
李玉春 2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
 2022-03-22 05:43:55 +00:00
李玉春 0babd13202 Merge branch 'app_cyy_bug' into 'master' 
* Modify story create error.

See merge request easycorp/zentaopms!2437
 2022-03-22 05:40:57 +00:00
李玉春 e811292dc9 Merge branch 'sprint/master_zhoxudong_14090' into 'master' 
Sprint/master zhoxudong 14090

See merge request easycorp/zentaopms!2435
 2022-03-22 05:12:46 +00:00
李玉春 73b13d19fe Merge branch 'sprint/pailei2_zhouxudong_15763' into 'master' 
*　Fix bug #15763.

See merge request easycorp/zentaopms!2417
 2022-03-22 03:01:10 +00:00
李玉春 e59d22f222 Merge branch 'mayue_fix_bug#20645' into 'master' 
* Fix bug #20645.

See merge request easycorp/zentaopms!2427
 2022-03-22 02:51:35 +00:00
李玉春 976ee4e6c5 Merge branch 'fix_bug#20646' into 'master' 
* Fix bug#20646.

See merge request easycorp/zentaopms!2428
 2022-03-22 02:50:39 +00:00
李玉春 7127d6e8ab Merge branch 'sprint/master_zhoxudong_15984' into 'master' 
* Fix bug #15984.

See merge request easycorp/zentaopms!2419
 2022-03-22 02:43:35 +00:00
李玉春 2019451473 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2421
 2022-03-22 02:20:59 +00:00
李玉春 e7503d435d Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2416
 2022-03-22 01:39:02 +00:00
李玉春 f676dddc95 Merge branch 'pailei2_sunhao_bug20681' into 'pailei2' 
* update zui and fix z-index conflict with pager dropmenu for fixed header in datatable.

See merge request easycorp/zentaopms!2396
 2022-03-21 08:44:26 +00:00
李玉春 0e4e9594c7 Merge branch 'pailei2_mayue_bug#20808' into 'pailei2' 
* Fix bug #20808.

See merge request easycorp/zentaopms!2403
 2022-03-21 08:44:09 +00:00
李玉春 fe118cd12f Merge branch 'sprint/pailei2_zhouxudong_12671' into 'pailei2' 
* Fix bug #12671.

See merge request easycorp/zentaopms!2391
 2022-03-21 05:40:40 +00:00
李玉春 57710b38ef Merge branch 'pailei2_sunhuawei_20355' into 'pailei2' 
*Fix bug 20355

See merge request easycorp/zentaopms!2389
 2022-03-21 05:11:31 +00:00
李玉春 5559456992 Merge branch 'pailei2_mayue_bug14363' into 'pailei2' 
* Fix bug #14363.

See merge request easycorp/zentaopms!2388
 2022-03-21 05:02:46 +00:00
李玉春 12785c8135 Merge branch 'sprint/pailei2_zhouxudong_11985' into 'pailei2' 
* Fix bug #11985.

See merge request easycorp/zentaopms!2387
 2022-03-21 01:57:02 +00:00
李玉春 e31498db93 Merge branch 'sprint/pailei2_zhouxudong_16264' into 'pailei2' 
* Fix bug #16264.

See merge request easycorp/zentaopms!2384
 2022-03-21 00:52:20 +00:00
李玉春 c361f267b3 Merge branch 'sprint/pailei2_zhouxudong_10978' into 'pailei2' 
* Fix bug #10978.

See merge request easycorp/zentaopms!2382
 2022-03-21 00:50:45 +00:00
李玉春 c68b7b1bb2 Merge branch 'sprint/pailei2_tianshujie_20957' into 'pailei2' 
* Fix bug #20957.

See merge request easycorp/zentaopms!2379
 2022-03-18 09:19:25 +00:00
李玉春 f935639cb8 Merge branch 'pailei2_zhouxin_fixbugs' into 'pailei2' 
Pailei2 zhouxin fixbugs

See merge request easycorp/zentaopms!2375
 2022-03-18 09:11:32 +00:00
李玉春 b0607bb683 Merge branch 'devops23_cyy' into 'devops24' 
Fix bug #17048, 20588.

See merge request easycorp/zentaopms!2374
 2022-03-18 09:08:39 +00:00
李玉春 197c45d292 Merge branch 'devops24_51105' into 'devops24' 
Finish task#51105,51102，51106

See merge request easycorp/zentaopms!2369
 2022-03-18 09:06:53 +00:00
李玉春 09ac8ec0f8 Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2' 
Sprint/pailei2 tianshujie fixbug

See merge request easycorp/zentaopms!2376
 2022-03-18 09:03:37 +00:00
李玉春 071f23375d Merge branch 'pailei2_mayue_bug#14184' into 'pailei2' 
* Fix bug #14184.

See merge request easycorp/zentaopms!2358
 2022-03-18 03:29:31 +00:00
李玉春 370313f69c Merge branch 'pailei2_mayue_bug#6960' into 'pailei2' 
* Fix bug #6960.

See merge request easycorp/zentaopms!2365
 2022-03-18 03:28:53 +00:00
李玉春 307c410724 Merge branch 'devops24_50667' into 'devops24' 
Finish task#50667,50675

See merge request easycorp/zentaopms!2349
 2022-03-18 01:03:32 +00:00
李玉春 f6e47fb1ce Merge branch 'tianshujie_upgrade' into 'master' 
* Delete useless files when upgrading.

See merge request easycorp/zentaopms!2353
 2022-03-17 09:25:12 +00:00
李玉春 3c80178924 Merge branch 'pailie_sunhao' into 'pailei2' 
* update zui to change background color for label ".status-blocked".

See merge request easycorp/zentaopms!2351
 2022-03-17 09:22:32 +00:00
李玉春 4d2981ca84 Merge branch 'pailei2_xieqiyu_16112' into 'pailei2' 
* Fix bug#16112.

See merge request easycorp/zentaopms!2343
 2022-03-17 09:04:53 +00:00
李玉春 92045688e8 Merge branch 'pailei2_sunhuawei_11010' into 'pailei2' 
*Fix bug #11010.

See merge request easycorp/zentaopms!2334
 2022-03-17 08:38:22 +00:00
李玉春 e624900d36 Merge branch 'sprint/pailei2_zhouxudong_20358' into 'pailei2' 
* Fix bug #20358.

See merge request easycorp/zentaopms!2344
 2022-03-17 08:37:46 +00:00
李玉春 cf6b1065ba Merge branch 'sprint/pailei2_zhouxudong_20121' into 'pailei2' 
* Fix bug #20121.

See merge request easycorp/zentaopms!2345
 2022-03-17 08:36:56 +00:00
李玉春 506dcfdc2d Merge branch 'pailei2_mayue_bug#15289' into 'pailei2' 
* Fix bug #15289.

See merge request easycorp/zentaopms!2342
 2022-03-17 07:55:03 +00:00
李玉春 0a266251d8 Merge branch 'pailei2_zhouxin_50809' into 'pailei2' 
Pailei2 zhouxin 50809

See merge request easycorp/zentaopms!2324
 2022-03-17 07:24:24 +00:00
李玉春 e822d8f7e5 Merge branch 'devops_cyy_bug' into 'devops24' 
Fix bug #12206, 12342.

See merge request easycorp/zentaopms!2337
 2022-03-17 06:59:33 +00:00
李玉春 de7939108a Merge branch 'pailei2_mayue_bug#14363' into 'pailei2' 
* Fix bug #14363.

See merge request easycorp/zentaopms!2340
 2022-03-17 06:55:07 +00:00
李玉春 19973ac398 Merge branch 'sprint/pailei2_zhouxudong_16264' into 'pailei2' 
* Fix bug #16264.

See merge request easycorp/zentaopms!2320
 2022-03-17 06:28:41 +00:00
李玉春 72b050e02e Merge branch 'sprint/pailei2_zhouxudong_20832' into 'pailei2' 
* Fix bug #20832.

See merge request easycorp/zentaopms!2339
 2022-03-17 06:25:33 +00:00
李玉春 4ee7dc75de Merge branch 'devops24_50697' into 'devops24' 
Code for task#50697,50685

See merge request easycorp/zentaopms!2328
 2022-03-17 05:57:15 +00:00
李玉春 8f529f185e Merge branch 'pailei2_mayue_bug#20746' into 'pailei2' 
* Fix bug #20746.

See merge request easycorp/zentaopms!2318
 2022-03-17 05:38:06 +00:00
李玉春 59850d5e8f Merge branch 'pailei2_sunhuawei_50728' into 'pailei2' 
*Fix bug#19716

See merge request easycorp/zentaopms!2252
 2022-03-17 05:36:01 +00:00
李玉春 29ee5b4226 Merge branch 'sprint/pailei2_tianshujie_18344' into 'pailei2' 
* Fix bug #18344.

See merge request easycorp/zentaopms!2323
 2022-03-17 03:20:09 +00:00