Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,315 Commits 2 Branches 292 Tags
b125b0fc2c37cb6f365f505fc8a9831677246651
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 21d4a48642 Merge branch 'liyuchun_fixbug' into 'master' 
Fix bug #17252,17367.

See merge request easycorp/zentaopms!2539
 2022-03-28 00:42:01 +00:00
孙广明 e736c8d8c0 Merge branch 'autotest_ly' into 'master' 
add project and product data

See merge request easycorp/zentaopms!2559
 2022-03-28 00:41:34 +00:00
孙广明 2ea79a7e21 Merge branch 'autotest_ly' into 'master' 
update story data

See merge request easycorp/zentaopms!2552
 2022-03-25 07:34:01 +00:00
孙广明 0d6d80e6f2 Merge branch 'sprint/autoTest_liumengyi_product' into 'master' 
* Add auto test of product.

See merge request easycorp/zentaopms!2551
 2022-03-25 07:33:06 +00:00
孙广明 8acea5b35c Merge branch 'master_xieqiyu_20878' into 'master' 
* Fix bug#20878.

See merge request easycorp/zentaopms!2547
 2022-03-25 06:59:00 +00:00
孙广明 06c255995c Merge branch 'mayue_fix_bug#17402' into 'master' 
* Fix bug#17402.

See merge request easycorp/zentaopms!2543
 2022-03-25 06:23:58 +00:00
孙广明 70ef6bae33 Merge branch 'fixbug_zhouxin_16571' into 'master' 
* Fix bug #16571.

See merge request easycorp/zentaopms!2498
 2022-03-25 03:17:04 +00:00
孙广明 82188691db Merge branch 'liyuchun_fixbug' into 'master' 
Liyuchun fixbug #18151,13732.

See merge request easycorp/zentaopms!2516
 2022-03-25 01:19:43 +00:00
孙广明 133c7f7b04 Merge branch 'master' into 'sprint/autoTest_liumengyi_product' 
# Conflicts:
#   module/product/model.php
 2022-03-24 09:04:36 +00:00
孙广明 ea4da61f53 Merge branch 'autotest_ly' into 'master' 
add story stage data

See merge request easycorp/zentaopms!2506
 2022-03-24 06:21:51 +00:00
孙广明 4889b79a59 Merge branch 'sunhuawei_fixbug_20863' into 'master' 
*Fix bug #20863.

See merge request easycorp/zentaopms!2502
 2022-03-24 06:10:01 +00:00
孙广明 8595ff996b Merge branch 'autotest_ly' into 'master' 
update storyspec data

See merge request easycorp/zentaopms!2504
 2022-03-24 06:09:35 +00:00
孙广明 043e9ac9ea Merge branch 'autotest_ly' into 'master' 
add storyreview data

See merge request easycorp/zentaopms!2500
 2022-03-24 02:59:25 +00:00
孙广明 42f7f22cd0 Merge branch 'autotest_ly' into 'master' 
add build and update story

See merge request easycorp/zentaopms!2495
 2022-03-24 01:36:24 +00:00
孙广明 3bfa2b8e0d Merge branch 'sprint/autoTest_liumengyi_todo' into 'master' 
* Add auto test of todo.

See merge request easycorp/zentaopms!2494
 2022-03-24 01:20:23 +00:00
孙广明 85c0bedc77 Merge branch 'master_xieqiyu_21037' into 'master' 
* Fix bug#21037.

See merge request easycorp/zentaopms!2480
 2022-03-23 09:27:21 +00:00
孙广明 c08b31e854 Merge branch 'sunhuawei_fixbug_11441' into 'master' 
*Fix bug#11441.

See merge request easycorp/zentaopms!2479
 2022-03-23 08:47:00 +00:00
孙广明 6e2325563f Merge branch 'master' into 'sprint/autoTest_liumengyi_todo' 
# Conflicts:
#   test/data/todo.yaml
#   test/ztest
 2022-03-23 08:02:10 +00:00
孙广明 06ce541a55 Merge branch 'autotest_ly' into 'master' 
add test by dept and data

See merge request easycorp/zentaopms!2485
 2022-03-23 08:01:30 +00:00
孙广明 337f12b7e3 Merge branch 'master_xieqiyu_20930' into 'master' 
* Fix bug#20930.

See merge request easycorp/zentaopms!2462
 2022-03-23 05:53:02 +00:00
孙广明 62e7ad71fc Merge branch 'liyuchun_bug_20430' into 'master' 
Fix bug #19644,19662,19680,20430.

See merge request easycorp/zentaopms!2466
 2022-03-23 05:51:57 +00:00
孙广明 1825eeb881 Merge branch 'fixbug_sunjun_17627' into 'master' 
Fixbug sunjun 17627

See merge request easycorp/zentaopms!2472
 2022-03-23 05:08:57 +00:00
孙广明 0c79df3fb6 Merge branch 'wyd_fixbug' into 'master' 
Wyd fixbug

See merge request easycorp/zentaopms!2461
 2022-03-23 00:53:36 +00:00
孙广明 dea5f09087 Merge branch 'fixbug_zhouxin_15517' into 'master' 
* Fix bug #15517.

See merge request easycorp/zentaopms!2460
 2022-03-22 09:26:27 +00:00
孙广明 fd523bb183 Merge branch 'fixbug_zhouxin_18746' into 'master' 
* Fix bug #18746.

See merge request easycorp/zentaopms!2456
 2022-03-22 09:14:26 +00:00
孙广明 9e75ac5fcc Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2459
 2022-03-22 09:13:00 +00:00
孙广明 d1a7a7f61f Merge branch 'mayue_fix_bug#20098' into 'master' 
Fix bug#20098.

See merge request easycorp/zentaopms!2450
 2022-03-22 08:17:58 +00:00
孙广明 8ce81869a2 Merge branch 'mayue_fix_bug#21052' into 'master' 
* Fix bug #21052.

See merge request easycorp/zentaopms!2451
 2022-03-22 07:58:26 +00:00
孙广明 41eee3ddd4 Merge branch 'master' into 'liyuchun_bug_17235' 
# Conflicts:
#   module/common/model.php
 2022-03-22 07:43:58 +00:00
孙广明 a6c689e3a4 Merge branch 'fixbug_zhouxin_13855' into 'master' 
Fix bug #13855.

See merge request easycorp/zentaopms!2448
 2022-03-22 07:41:28 +00:00
孙广明 3444ec3102 Merge branch 'fixbug_zhouxin_17943' into 'master' 
Fix bug #17943.

See merge request easycorp/zentaopms!2442
 2022-03-22 07:40:26 +00:00
孙广明 de5f46d9ff Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2444
 2022-03-22 07:16:10 +00:00
孙广明 9999bad8bb Merge branch 'autotest_ly' into 'master' 
add data of test

See merge request easycorp/zentaopms!2438
 2022-03-22 06:06:52 +00:00
孙广明 88f1cd03d5 Merge branch 'fixbug_zhouxin_17415' into 'master' 
Fix bug #17415.

See merge request easycorp/zentaopms!2436
 2022-03-22 06:06:31 +00:00
孙广明 867d93e7f5 Merge branch 'master_xieqiyu_20396' into 'master' 
* Fix bug#20396.

See merge request easycorp/zentaopms!2432
 2022-03-22 03:13:25 +00:00
孙广明 086ef6666b Merge branch 'autotest_ly' into 'master' 
add dept and bug data

See merge request easycorp/zentaopms!2425
 2022-03-22 02:55:38 +00:00
孙广明 55679240ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2422
 2022-03-22 02:17:01 +00:00
孙广明 d8048bbb01 Merge branch 'fixbug_zhouxin_17415' into 'master' 
Fix bug #17415.

See merge request easycorp/zentaopms!2418
 2022-03-22 01:52:10 +00:00
孙广明 ec07938f4c Merge branch 'pailei2_xieqiyu_createBug' into 'pailei2' 
* Modify create bug.

See merge request easycorp/zentaopms!2410
 2022-03-22 00:45:36 +00:00
孙广明 e43dddd2dd Merge branch 'devops24_liyuchun' into 'devops24' 
Fix bug 20580.

See merge request easycorp/zentaopms!2404
 2022-03-22 00:35:07 +00:00
孙广明 a222494e09 Merge branch 'sprint/sunhao/firefox_bug' into 'master' 
* Fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>.

See merge request easycorp/zentaopms!2401
 2022-03-22 00:34:50 +00:00
孙广明 abaf5322da Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
*  Add auto test of bug.

See merge request easycorp/zentaopms!2409
 2022-03-22 00:34:11 +00:00
孙广明 386dd3f000 Merge branch 'pailei2_zhouxin_19382' into 'pailei2' 
Fix bug #19382.

See merge request easycorp/zentaopms!2392
 2022-03-22 00:33:36 +00:00
孙广明 9995d4c68d Merge branch 'fixbug' into 'master' 
* Fix bug for upgrade.

See merge request easycorp/zentaopms!2400
 2022-03-21 08:13:34 +00:00
孙广明 b7ccaaec25 Update model.php 2022-03-21 08:13:24 +00:00
孙广明 c8c25d957f Merge branch 'pailei_sj_17317' into 'pailei2' 
fixbug #17317

See merge request easycorp/zentaopms!2394
 2022-03-21 06:37:20 +00:00
孙广明 c44da998c0 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2393
 2022-03-21 06:30:44 +00:00
孙广明 913b58bc06 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2390
 2022-03-21 03:46:44 +00:00
孙广明 fe214852d4 Merge branch 'devops24_liyuchun' into 'devops24' 
Fix bug #19698.

See merge request easycorp/zentaopms!2380
 2022-03-21 02:57:15 +00:00
孙广明 64ccd9b528 Merge branch 'pailei_sj_16662' into 'pailei2' 
fixbug #16662

See merge request easycorp/zentaopms!2385
 2022-03-21 01:14:53 +00:00
孙广明 73e6d617ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Modify code.

See merge request easycorp/zentaopms!2383
 2022-03-21 00:29:00 +00:00
孙广明 f2d235caef Merge branch 'autotest_ly' into 'master' 
add company test

See merge request easycorp/zentaopms!2377
 2022-03-18 07:59:17 +00:00
孙广明 fedc6ab93a Merge branch 'pailei2_sunhuawei_16686' into 'pailei2' 
Fix bug #16686.

See merge request easycorp/zentaopms!2371
 2022-03-18 06:42:45 +00:00
孙广明 036b24a26a Merge branch 'pailei2_mayue_bug#6907' into 'pailei2' 
* Fix bug #6907.

See merge request easycorp/zentaopms!2372
 2022-03-18 06:38:55 +00:00
孙广明 daf8a4143a Merge branch 'autotest_denghongtao' into 'master' 
add misc and productplan

See merge request easycorp/zentaopms!2366
 2022-03-18 05:15:40 +00:00
孙广明 21d6c27a4b Update getlist.php 2022-03-18 05:15:30 +00:00
孙广明 071c930bec Update getbyidlist.php 2022-03-18 05:15:13 +00:00
孙广明 d9505fa9fa Merge branch 'pailei2_zhouxin_50796' into 'pailei2' 
Pailei2 zhouxin 50796

See merge request easycorp/zentaopms!2341
 2022-03-18 03:25:54 +00:00
孙广明 90159bc2b0 Merge branch 'autotest_ly' into 'master' 
update product plan

See merge request easycorp/zentaopms!2364
 2022-03-18 03:09:44 +00:00
孙广明 6aa79b6007 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2361
 2022-03-18 02:53:05 +00:00
孙广明 8b3c1af81d Merge branch 'autotest_ly' into 'master' 
add storyspec data

See merge request easycorp/zentaopms!2360
 2022-03-18 02:41:54 +00:00
孙广明 19d86da89f Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' 
* Fix bug #20712,20800.

See merge request easycorp/zentaopms!2313
 2022-03-18 01:21:20 +00:00
孙广明 2d13ee0616 Merge branch 'autotest_ly' into 'master' 
add doclib data

See merge request easycorp/zentaopms!2352
 2022-03-17 09:23:59 +00:00
孙广明 4b68b7c78c Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2350
 2022-03-17 09:13:33 +00:00
孙广明 60fa02e648 Merge branch 'autotest_ly' into 'master' 
rm surplus data

See merge request easycorp/zentaopms!2338
 2022-03-17 06:06:46 +00:00
孙广明 0542a65ed0 Merge branch 'pailei_sj_50765' into 'pailei2' 
fixbug #19324

See merge request easycorp/zentaopms!2336
 2022-03-17 06:02:46 +00:00
孙广明 ee15271a2f Merge branch 'autotest_ly' into 'master' 
rm move.sh and runtime.zip

See merge request easycorp/zentaopms!2335
 2022-03-17 05:58:27 +00:00
孙广明 849646477a Merge branch 'pailei2_xieqiyu_20381' into 'pailei2' 
* Fix bug#20381.

See merge request easycorp/zentaopms!2321
 2022-03-17 05:49:46 +00:00
孙广明 ba9df85338 Merge branch 'pailei2_xieqiyu_18756' into 'pailei2' 
* Fix bug#18756.

See merge request easycorp/zentaopms!2331
 2022-03-17 05:49:10 +00:00
孙广明 a253bc2246 Merge branch 'autotest_ly' into 'master' 
update bug story data

See merge request easycorp/zentaopms!2333
 2022-03-17 05:47:09 +00:00
孙广明 d4105656d1 Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2329
 2022-03-17 05:27:55 +00:00
孙广明 808ca1ee66 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2330
 2022-03-17 05:27:17 +00:00
孙广明 2a4bbc6261 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2327
 2022-03-17 03:16:40 +00:00
孙广明 f4cb0c03db Merge branch 'pailei2_xieqiyu_20850' into 'pailei2' 
* Fix bug#20850.

See merge request easycorp/zentaopms!2315
 2022-03-17 01:50:45 +00:00
孙广明 33da6a026f Merge branch 'devops24_liyuchun_50711' into 'devops24' 
Fix bug #50711

See merge request easycorp/zentaopms!2311
 2022-03-16 13:59:03 +00:00
孙广明 484dae9ad5 Merge branch 'devops24_liyuchun_gitlab' into 'devops24' 
在合并请求列表增加提交人

See merge request easycorp/zentaopms!2317
 2022-03-16 13:58:34 +00:00
孙广明 8872899517 Merge branch 'pailei2_mayue_bug#17216' into 'pailei2' 
Optimize code.

See merge request easycorp/zentaopms!2316
 2022-03-16 09:18:32 +00:00
孙广明 ad09d2d6be Merge branch 'sprint/tianshujie_17734' into 'pailei2' 
Sprint/tianshujie 17734

See merge request easycorp/zentaopms!2314
 2022-03-16 08:25:00 +00:00
孙广明 d21ec4ac9a Merge branch 'autotest_ly' into 'master' 
update execution test and add usercontact data

See merge request easycorp/zentaopms!2303
 2022-03-16 07:03:23 +00:00
孙广明 11bc8282aa Merge branch 'sprint/pailei2_tianshujie_19289' into 'pailei2' 
Sprint/pailei2 tianshujie 19289

See merge request easycorp/zentaopms!2300
 2022-03-16 06:59:44 +00:00
孙广明 8472794851 Merge branch 'sprint/pailei2_tianshujie_18760' into 'pailei2' 
Sprint/pailei2 tianshujie 18760

See merge request easycorp/zentaopms!2308
 2022-03-16 06:58:40 +00:00
孙广明 833786e128 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2305
 2022-03-16 06:38:40 +00:00
孙广明 52193bd9ee Merge branch 'pailei_sunjun_50784' into 'pailei2' 
fixbug #18669

See merge request easycorp/zentaopms!2304
 2022-03-16 06:32:04 +00:00
孙广明 c40cc261ec Merge branch 'devops_liyuchun_gitlab' into 'master' 
Fix bug #20833

See merge request easycorp/zentaopms!2298
 2022-03-16 05:40:30 +00:00
孙广明 e2eb8999e5 Merge branch 'pailei2_zhouxin_50789' into 'pailei2' 
Pailei2 zhouxin 50789

See merge request easycorp/zentaopms!2294
 2022-03-16 05:28:51 +00:00
孙广明 6058067301 Merge branch 'pailei2_zhouxin_50791' into 'pailei2' 
Fix bug #18301.

See merge request easycorp/zentaopms!2295
 2022-03-16 05:27:57 +00:00
孙广明 4cc13f3b13 Merge branch 'pailei2_mayue_bug#17576' into 'pailei2' 
* Revert code.

See merge request easycorp/zentaopms!2296
 2022-03-16 05:10:42 +00:00
孙广明 df8fdc5c9c Merge branch 'autotest_denghongtao' into 'master' 
update unittest

See merge request easycorp/zentaopms!2289
 2022-03-16 02:42:04 +00:00
孙广明 88c8d61e5c Merge branch 'sprint/tianshujie_icon' into 'master' 
* Fix icon for kanban project.

See merge request easycorp/zentaopms!2291
 2022-03-16 02:41:23 +00:00
孙广明 02b73ecbc3 Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2' 
* Finish task #50722.

See merge request easycorp/zentaopms!2285
 2022-03-16 00:47:44 +00:00
孙广明 985a3d5d95 Merge branch 'autotest_ly' into 'master' 
add execution test

See merge request easycorp/zentaopms!2280
 2022-03-15 09:17:11 +00:00
孙广明 732b928b0b Merge branch 'sprint/pailei2_tianshujie_19321' into 'pailei2' 
Sprint/pailei2 tianshujie 19321

See merge request easycorp/zentaopms!2278
 2022-03-15 09:10:15 +00:00
孙广明 4883fe8444 Merge branch 'autoTest_liumengyi_task' into 'master' 
* Add function annotations.

See merge request easycorp/zentaopms!2277
 2022-03-15 08:58:51 +00:00
孙广明 69c22ecbf3 Merge branch 'sprint/master_tanghucheng_fix' into 'master' 
* Fix bug #20779,20782,20783.

See merge request easycorp/zentaopms!2275
 2022-03-15 08:34:33 +00:00
孙广明 520148796d Merge branch 'pailei2_xieqiyu_50430' into 'pailei2' 
* Fix bug#20111.

See merge request easycorp/zentaopms!2261
 2022-03-15 07:48:25 +00:00
孙广明 9d2c1baa9f Merge branch 'autoTest_liumengyi_task' into 'master' 
* Add auto test of task.

See merge request easycorp/zentaopms!2274
 2022-03-15 07:48:07 +00:00
孙广明 df49ac6f81 Merge branch 'autoTest_liumengyi_task' into 'master' 
* Change file name to lowercase.

See merge request easycorp/zentaopms!2271
 2022-03-15 07:16:29 +00:00
孙广明 503e169dbd Merge branch 'sprint/187_hufangzhou_20735' into 'master' 
* Fix bug #20735.

See merge request easycorp/zentaopms!2269
 2022-03-15 06:36:53 +00:00
孙广明 1f6c6363ba Merge branch 'pailei2_sj_50765' into 'pailei2' 
fixbug #19324

See merge request easycorp/zentaopms!2268
 2022-03-15 06:02:50 +00:00
孙广明 28f4a13262 Merge branch 'autoTest_liumengyi_task' into 'master' 
* Add auto test of task.

See merge request easycorp/zentaopms!2266
 2022-03-15 05:55:18 +00:00