Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
37,648 Commits 2 Branches 292 Tags
2f3f35679087f332d0ddf4656684f3acdb849757
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhujinyong 2f3f356790 * Fix product param. 2022-04-19 08:36:02 +08:00
zhujinyong 25eb24fe7d - Remove submodule. 2022-04-19 08:23:15 +08:00
zhujinyong b8aea6f999 Merge branch 'sprint/sunhao/bug13445' 2022-04-18 17:18:22 +08:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
朱金勇 e61d35ba1d Merge branch 'sprint/sunhao/bug21225' into 'master' 
* bug #21225, bug #16589, support for adjusting submenu position in dropdown.

See merge request easycorp/zentaopms!2977
 2022-04-18 09:11:55 +00:00
朱金勇 7aeeb96c42 Merge branch 'fix_bug_wangxiaomeng_#17253' into 'master' 
fix_bug_17253

See merge request easycorp/zentaopms!2959
 2022-04-18 00:13:57 +00:00
朱金勇 1ad5accfce Merge branch 'sprint/sunhao/bug19052' into 'master' 
* bug #19052, fix width for some models.

See merge request easycorp/zentaopms!2965
 2022-04-18 00:10:55 +00:00
朱金勇 31306a52af Merge branch 'autotest_ly' into 'master' 
add case and bug module

See merge request easycorp/zentaopms!2954
 2022-04-15 01:27:03 +00:00
朱金勇 dce364da2e Merge branch 'autotest_ly' into 'master' 
update bug data

See merge request easycorp/zentaopms!2948
 2022-04-14 08:05:25 +00:00
朱金勇 b326490350 Merge branch 'sprint/tianshujie_bug21717' into 'master' 
Sprint/tianshujie bug21717

See merge request easycorp/zentaopms!2946
 2022-04-14 07:53:46 +00:00
朱金勇 cb7ca052b3 Merge branch 'autotest_ly' into 'master' 
add docmodule data

See merge request easycorp/zentaopms!2943
 2022-04-14 06:56:59 +00:00
朱金勇 8953c9f547 Merge branch 'devops26_52592' into 'master' 
Fix bug#17082,17990

See merge request easycorp/zentaopms!2940
 2022-04-14 06:52:23 +00:00
朱金勇 e63ab95fe5 Merge branch 'sprint/renying_bug17274' into 'master' 
Fix bug#17274

See merge request easycorp/zentaopms!2941
 2022-04-14 06:45:01 +00:00
朱金勇 89a17c72f0 Merge branch 'fixbug_wangxiaomeng' into 'master' 
Aborting commit due to empty commit message

See merge request easycorp/zentaopms!2934
 2022-04-14 06:43:53 +00:00
zhujinyong d2fd124cb9 * Fix url of file. 2022-04-14 12:58:20 +08:00
朱金勇 fcb09f3afe Merge branch 'sprint/scx_file' into 'master' 
* Fix json_decode twice image data(url) not found.

See merge request easycorp/zentaopms!2926
 2022-04-14 02:17:25 +00:00
朱金勇 bdf2552afd Merge branch 'zry_app' into 'master' 
* Add api for record estimate for bug.

See merge request easycorp/zentaopms!2906
 2022-04-14 02:05:08 +00:00
朱金勇 113bfe07a9 Merge branch 'sprint/sunhao/bug15650' into 'master' 
* bug #15650, fix modal close button not show after reload modal with inner modal.

See merge request easycorp/zentaopms!2921
 2022-04-13 16:14:57 +00:00
朱金勇 a534c56793 Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2901
 2022-04-13 02:11:33 +00:00
朱金勇 d2dcdd6a91 Merge branch 'zry_app' into 'master' 
* Fix api for bug to story.

See merge request easycorp/zentaopms!2900
 2022-04-13 02:11:16 +00:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master' 
App zry

See merge request easycorp/zentaopms!2872
 2022-04-12 07:28:24 +00:00
zhujinyong 4f8d2791ed * Reset cookie. 2022-04-12 09:12:07 +08:00
朱金勇 214fcd9443 Merge branch 'sprint/autoTest_liumengyi_programplan' into 'master' 
* Add auto test of programplan.

See merge request easycorp/zentaopms!2869
 2022-04-11 09:06:25 +00:00
朱金勇 167dcc90a0 Merge branch 'autotest_ly' into 'master' 
update execution data

See merge request easycorp/zentaopms!2863
 2022-04-11 07:59:43 +00:00
朱金勇 1547d004d7 Merge branch 'app_zry' into 'master' 
* Fix api for review story.

See merge request easycorp/zentaopms!2857
 2022-04-11 07:29:38 +00:00
朱金勇 b19df074ab Merge branch 'sprint/scx_updateLang' into 'master' 
* Translate lang.

See merge request easycorp/zentaopms!2848
 2022-04-11 05:57:47 +00:00
朱金勇 dec9924838 Merge branch 'sgm_testtask' into 'master' 
Sgm testtask

See merge request easycorp/zentaopms!2853
 2022-04-11 05:57:26 +00:00
朱金勇 ec9aef0807 Merge branch 'sprint/scx_api' into 'master' 
* Fix api format data bug.

See merge request easycorp/zentaopms!2835
 2022-04-11 01:10:52 +00:00
朱金勇 f18d965783 Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2834
 2022-04-08 07:49:14 +00:00
朱金勇 43c2eafac9 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master' 
* Add auto test of testcase and fix bug.

See merge request easycorp/zentaopms!2833
 2022-04-08 07:47:07 +00:00
朱金勇 a56b1a77c9 Merge branch 'sgm_projecttest' into 'master' 
Sgm projecttest

See merge request easycorp/zentaopms!2813
 2022-04-08 06:06:55 +00:00
朱金勇 0c23ddd5f7 Merge branch 'sprint/sunhao/bug16555' into 'master' 
* bug #16555, remove scrollbar when drag item to outside of kanban.

See merge request easycorp/zentaopms!2799
 2022-04-08 06:06:13 +00:00
朱金勇 ac66966bca Merge branch 'sprint/sunhao/bug21160' into 'master' 
* bug #21160, optimize chosen UI.

See merge request easycorp/zentaopms!2808
 2022-04-08 06:06:02 +00:00
朱金勇 08f9f8e1e6 Merge branch 'sprint/sunhao/optimize_ajax_dropmenu' into 'master' 
* fix search and redirect in ajax dropmenu not work as expected sometimes.

See merge request easycorp/zentaopms!2823
 2022-04-08 06:05:50 +00:00
朱金勇 1518796b03 Merge branch 'app_zry' into 'master' 
* Fix bug 21591.

See merge request easycorp/zentaopms!2828
 2022-04-08 06:05:36 +00:00
朱金勇 c971b37e71 Merge branch 'sprint/sunhao/radio_radius_firefox' into 'master' 
* fix radio outline radius in firefox on focus.

See merge request easycorp/zentaopms!2781
 2022-04-07 01:49:45 +00:00
朱金勇 1467a0d9e5 Merge branch 'sprint/autoTest_liumengyi_action' into 'master' 
* Add auto test of aciton.

See merge request easycorp/zentaopms!2782
 2022-04-07 01:49:35 +00:00
朱金勇 ecbbc59166 Merge branch 'sgm_projecttest' into 'master' 
Sgm projecttest

See merge request easycorp/zentaopms!2775
 2022-04-06 09:09:27 +00:00
朱金勇 a70a61f078 Merge branch 'spring/sunhao/bug18928' into 'master' 
* bug #18928, fix switch button not work when statistic block place in right side.

See merge request easycorp/zentaopms!2747
 2022-04-06 05:28:50 +00:00
朱金勇 33adc0ffbb Merge branch 'sprint/sunhao/bug17170' into 'master' 
* bug #17170, support for toggle all children rows on toggle parent row.

See merge request easycorp/zentaopms!2744
 2022-04-02 08:23:42 +00:00
朱金勇 b376b08cbd Merge branch 'sgm_projecttest' into 'master' 
Sgm projecttest

See merge request easycorp/zentaopms!2746
 2022-04-02 08:23:16 +00:00
zhujinyong 9a97e8d11d + Add submodule qucheng. 2022-04-02 10:53:40 +08:00
朱金勇 29609debae Merge branch 'sgm_programtest' into 'master' 
Sgm programtest

See merge request easycorp/zentaopms!2723
 2022-04-02 02:15:35 +00:00
朱金勇 39df077d60 Merge branch 'sprint/sunhao/bug18283' into 'master' 
* bug #18283, prevent go prev/next item by hotkey when page has focused form control.

See merge request easycorp/zentaopms!2706
 2022-04-01 07:26:24 +00:00
朱金勇 c84e6fabd0 Merge branch 'spring/sunhao/bug21345' into 'master' 
* bug #21345, fix build name not show as expected in chosen dropdown.

See merge request easycorp/zentaopms!2682
 2022-04-01 00:31:06 +00:00
朱金勇 65501592bf Merge branch 'sgm_storytest' into 'master' 
Sgm storytest

See merge request easycorp/zentaopms!2680
 2022-03-31 09:05:32 +00:00
朱金勇 d5c93681f0 Merge branch 'sprint/scx_fixhelperbug' into 'master' 
* Fix api helper bug.

See merge request easycorp/zentaopms!2677
 2022-03-31 08:32:09 +00:00
zhujinyong 5427477839 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 16:27:36 +08:00
zhujinyong 8da5fe3c90 + Add api of ci result. 2022-03-31 16:27:11 +08:00
朱金勇 fb49f8ebbd Merge branch 'sgm_fixbug' into 'master' 
* Fix my - preference bug.

See merge request easycorp/zentaopms!2663
 2022-03-31 03:32:34 +00:00
朱金勇 fa1201fead Merge branch 'sprint/scx_api' into 'master' 
* Fix taskbatchcreate API bug .

See merge request easycorp/zentaopms!2643
 2022-03-31 03:23:59 +00:00
朱金勇 29abda11d5 Merge branch 'sprint/sunhao/bug18424' into 'master' 
* bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document.

See merge request easycorp/zentaopms!2655
 2022-03-31 03:23:38 +00:00
朱金勇 0992ce7fda Merge branch 'app_zry' into 'master' 
* Add api for project.

See merge request easycorp/zentaopms!2658
 2022-03-31 03:23:29 +00:00
zhujinyong 943e32c7a9 * Fix type of options api. 2022-03-30 17:10:46 +08:00
zhujinyong b48c3c68b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-30 17:08:31 +08:00
zhujinyong a91d090845 + Add options api. 2022-03-30 17:08:03 +08:00
朱金勇 86a65d6c2e Merge branch 'autotest_ly' into 'master' 
add data of test

See merge request easycorp/zentaopms!2633
 2022-03-30 06:43:46 +00:00
朱金勇 b77563e431 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2626
 2022-03-30 01:05:05 +00:00
朱金勇 53468f156f Merge branch 'sprint/scx_checkapi' into 'master' 
* Check locate if api.

See merge request easycorp/zentaopms!2603
 2022-03-29 03:19:25 +00:00
朱金勇 aa0e80bf2d Merge branch 'app_zry' into 'master' 
* Fix bug for change story.

See merge request easycorp/zentaopms!2601
 2022-03-29 03:08:40 +00:00
朱金勇 fe3cbd34d1 Merge branch 'app_zhengrunyu' into 'master' 
* Add api for close bug and confirm bug.

See merge request easycorp/zentaopms!2599
 2022-03-29 01:48:20 +00:00
zhujinyong be75d25da7 * Fix api doc. 2022-03-29 09:25:15 +08:00
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master' 
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
 2022-03-28 09:01:06 +00:00
朱金勇 863f39ea81 Merge branch 'sprint/sunhao/bug19123' into 'master' 
* bug #19123, skip to check iframe when url has "_single" param for debug mode.

See merge request easycorp/zentaopms!2584
 2022-03-28 09:00:49 +00:00
朱金勇 0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master' 
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
 2022-03-28 09:00:40 +00:00
朱金勇 e1e5d8caff Merge branch 'sprint/sunhao/bug20928' into 'master' 
* bug #20928, support to affix region scrollbar in kanban.

See merge request easycorp/zentaopms!2591
 2022-03-28 09:00:30 +00:00
朱金勇 a0a1995807 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Modify auto test of product.

See merge request easycorp/zentaopms!2569
 2022-03-28 02:49:39 +00:00
朱金勇 9c675f316c Merge branch 'sprint/sunhao/bug19123' into 'master' 
* try to redirect to index/index when access iframe page directly.

See merge request easycorp/zentaopms!2557
 2022-03-28 02:32:57 +00:00
朱金勇 6b03905a08 Merge branch 'sprint/sunhao/theme_blue' into 'master' 
* fix version switcher button style for theme "blue".

See merge request easycorp/zentaopms!2562
 2022-03-28 02:32:40 +00:00
朱金勇 0901a14d5d Merge branch 'app_zhengrunyu' into 'master' 
* Change api for story.

See merge request easycorp/zentaopms!2535
 2022-03-28 02:32:18 +00:00
朱金勇 530f055e7b Merge branch 'sgm_storytest' into 'master' 
* Remove unused code and fix bug.

See merge request easycorp/zentaopms!2545
 2022-03-25 06:29:10 +00:00
朱金勇 d097a892cf Merge branch 'sprint/sunhao/bug11279' into 'master' 
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.

See merge request easycorp/zentaopms!2540
 2022-03-25 06:28:32 +00:00
朱金勇 dbdbe26be7 Merge branch 'sprint/scx_getproductsbyproject' into 'master' 
* Get products by projectID.

See merge request easycorp/zentaopms!2541
 2022-03-25 06:28:12 +00:00
朱金勇 339ac919c6 Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2533
 2022-03-25 02:30:24 +00:00
朱金勇 71756da30e Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2532
 2022-03-25 02:24:35 +00:00
朱金勇 f8911950dd Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug classic vision

See merge request easycorp/zentaopms!2529
 2022-03-25 01:39:47 +00:00
朱金勇 01310e31ce Merge branch 'sprint/scx_englishfeatures' into 'master' 
*English features.

See merge request easycorp/zentaopms!2528
 2022-03-25 01:28:09 +00:00
朱金勇 5900a80918 Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master' 
* fix columns layout confusion.

See merge request easycorp/zentaopms!2523
 2022-03-25 01:11:44 +00:00
朱金勇 4369a3e2c3 Merge branch 'sprint/sunhao/fix_merge_mistake' into 'master' 
* fix mistable  for merging zui.js.

See merge request easycorp/zentaopms!2526
 2022-03-25 01:11:31 +00:00
zhujinyong eaf550b617 Merge branch 'sprint/sunhao/bug15206' 2022-03-24 21:23:36 +08:00
朱金勇 47dc604e6d Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master' 
* fix maincontent confution.

See merge request easycorp/zentaopms!2522
 2022-03-24 13:20:37 +00:00
朱金勇 c6077f7c40 Merge branch 'sgm_storytest' into 'master' 
* Add story test.

See merge request easycorp/zentaopms!2521
 2022-03-24 09:21:41 +00:00
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master' 
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
 2022-03-24 09:20:45 +00:00
朱金勇 b59ec4b785 Merge branch 'sprint/scx_branch_codeformat' into 'master' 
*AjaxGetBranches function code format.

See merge request easycorp/zentaopms!2515
 2022-03-24 07:41:58 +00:00
朱金勇 5f1f55d874 Merge branch 'sprint/scx_storyestimate' into 'master' 
*Record and get story efforts.

See merge request easycorp/zentaopms!2481
 2022-03-23 08:59:16 +00:00
朱金勇 e0d07d0fc8 Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2469
 2022-03-23 03:27:30 +00:00
朱金勇 b7d1948967 Merge branch 'app_zhengrunyu' into 'master' 
* Change api for create bug and change stroy.

See merge request easycorp/zentaopms!2467
 2022-03-23 02:45:34 +00:00
朱金勇 f04583c827 Merge branch 'app_zhengrunyu' into 'master' 
*Fix api for user.

See merge request easycorp/zentaopms!2457
 2022-03-22 08:58:25 +00:00
朱金勇 68dc7ba793 Merge branch 'app_zhengrunyu' into 'master' 
*Fix api .

See merge request easycorp/zentaopms!2454
 2022-03-22 08:27:17 +00:00
朱金勇 297a9969dc Merge branch 'sprint/scx_api' into 'master' 
*Task batchCreate API.

See merge request easycorp/zentaopms!2420
 2022-03-22 07:38:53 +00:00
朱金勇 743f6b685a Merge branch 'sprint/scx_estimate' into 'master' 
*Get task estimates.;

See merge request easycorp/zentaopms!2441
 2022-03-22 07:38:04 +00:00
朱金勇 f523d8f121 Merge branch 'sgm_storytest' into 'master' 
* Add story test and fix bug.

See merge request easycorp/zentaopms!2439
 2022-03-22 06:09:37 +00:00
zhujinyong b621511457 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 11:14:52 +08:00
zhujinyong 43af3185e2 * Support case group. 2022-03-22 11:14:08 +08:00
zhujinyong 0cf390702c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:55:21 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
zhujinyong e91bf2520c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:55:03 +08:00
zhujinyong e3ec91da2a + Add modules api. 2022-03-22 09:54:35 +08:00
朱金勇 6272c75817 Merge branch 'sprint/sunhao/fix_paste_image' into 'master' 
* Fix paste image from dingding not work @mayue.

See merge request easycorp/zentaopms!2408
 2022-03-22 00:55:47 +00:00
朱金勇 d4ae966ebc Merge branch 'sprint/xuanxuan_93' into 'master' 
Zentaoclient related changes from xuanxuan sprint 93

See merge request easycorp/zentaopms!2398
 2022-03-22 00:55:07 +00:00