Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,828 Commits 2 Branches 292 Tags
ebf67b040e49ee96e57ae7dc0ff76d9c8cfa00cd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 780b9c26b7 Merge branch 'bug_32024' into 'master' 
* Fix bug #32024

See merge request easycorp/zentaopms!6924
 2023-02-13 02:54:36 +00:00
wangyidong c724e74778 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-13 09:46:59 +08:00
王怡栋 e630221a20 Merge branch 'dev/gfl_fix_style_problem_in_flowChart' into 'master' 
* Code for class refactors in flowChart

See merge request easycorp/zentaopms!6923
 2023-02-13 01:46:44 +00:00
wangyidong 11653a8914 * fix bug. 2023-02-13 09:45:43 +08:00
王怡栋 6570609c76 Merge branch 'master_bug_32044' into 'master' 
* Adjust code for bug #32044.

See merge request easycorp/zentaopms!6922
 2023-02-13 00:34:11 +00:00
王怡栋 ab9c08a4ef Merge branch 'lh_bug' into 'master' 
* Adjust code.

See merge request easycorp/zentaopms!6921
 2023-02-13 00:33:44 +00:00
王怡栋 e3ea45ab1a Merge branch 'sprint/hufangzhou_createsubstage' into 'master' 
* Modify the default value of acl when create sub-stage.

See merge request easycorp/zentaopms!6919
 2023-02-13 00:33:30 +00:00
王怡栋 1d8d34ef6b Merge branch 'master_xieqiyu_32034' into 'master' 
* Fix bug#32034.

See merge request easycorp/zentaopms!6918
 2023-02-10 07:45:44 +00:00
王怡栋 ca1ff74c60 Merge branch 'fixbug_liumengyi_sql' into 'master' 
* Add sql.

See merge request easycorp/zentaopms!6916
 2023-02-10 06:10:47 +00:00
王怡栋 009d29f79e Merge branch 'hufangzhou_fixbug' into 'master' 
* Modifying the access control of the parent phase does not synchronize the child phase's.

See merge request easycorp/zentaopms!6915
 2023-02-10 06:10:32 +00:00
王怡栋 2d9fe72fae Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix admin model menu bug.

See merge request easycorp/zentaopms!6912
 2023-02-10 03:31:06 +00:00
王怡栋 cdb87a322f Merge branch 'dev/gfl_fix_style_in_flowChart' into 'master' 
Dev/gfl fix style in flow chart

See merge request easycorp/zentaopms!6914
 2023-02-10 03:29:13 +00:00
wangyidong de07d90b19 * fix bug #32016. 2023-02-10 11:22:34 +08:00
王怡栋 372b93aaec Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix bug #30351.

See merge request easycorp/zentaopms!6905
 2023-02-09 06:58:15 +00:00
王怡栋 ebd4168d04 Merge branch 'daitingting_bug_#24499' into 'master' 
* Fix bug #24499.

See merge request easycorp/zentaopms!6903
 2023-02-09 06:47:00 +00:00
王怡栋 3dfe1195df Merge branch 'hfz_compatible_php53' into 'master' 
* Compatible with php5.3.

See merge request easycorp/zentaopms!6901
 2023-02-09 06:46:34 +00:00
王怡栋 8a7d835dc3 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix bug #28865.

See merge request easycorp/zentaopms!6899
 2023-02-09 05:16:05 +00:00
王怡栋 063f3b9441 Merge branch 'cyy_bug' into 'master' 
* Modify array defined.

See merge request easycorp/zentaopms!6900
 2023-02-09 05:15:44 +00:00
王怡栋 a3ba63db67 Merge branch 'daitingting_bug_#30843' into 'master' 
* Fix bug #30843.

See merge request easycorp/zentaopms!6894
 2023-02-09 02:56:43 +00:00
王怡栋 d138ee5eea Merge branch 'sprint/gfl_update_zui_css' into 'master' 
* zui: Code for update theme css.

See merge request easycorp/zentaopms!6892
 2023-02-09 02:56:02 +00:00
王怡栋 63fb16c7e4 Merge branch 'sprint/tsj_fixbug' into 'master' 
* Fix bug #23550.

See merge request easycorp/zentaopms!6896
 2023-02-09 02:55:40 +00:00
王怡栋 436f7a3313 Merge branch 'ticket_326' into 'master' 
code for Ticket 326 bug 31981

See merge request easycorp/zentaopms!6891
 2023-02-08 09:17:24 +00:00
wangyidong bc4c940d20 Merge branch 'zentaopms_wangyuting' 2023-02-08 16:30:30 +08:00
王怡栋 9331b9856a Merge branch 'master' into 'zentaopms_wangyuting' 
# Conflicts:
#   module/programplan/view/gantt.html.php
 2023-02-08 08:30:14 +00:00
王怡栋 26e6c3cdb3 Merge branch 'master_xieqiyu_29159' into 'master' 
* Code for bug#29159.

See merge request easycorp/zentaopms!6890
 2023-02-08 08:29:30 +00:00
王怡栋 2a6360f45f Merge branch 'ticket_329' into 'master' 
Ticket 329

See merge request easycorp/zentaopms!6886
 2023-02-08 08:28:54 +00:00
王怡栋 6cc3863a63 Merge branch 'fixbug_tanghucheng' into 'master' 
* Fix bug for import testcase.

See merge request easycorp/zentaopms!6884
 2023-02-08 08:28:23 +00:00
王怡栋 3d032b1cf6 Merge branch 'bug_31963' into 'master' 
* Fix bug#31963

See merge request easycorp/zentaopms!6883
 2023-02-08 08:28:00 +00:00
王怡栋 054c55b38d Merge branch 'sprint/hufangzhou_284_changelog' into 'master' 
* Complete changelog.

See merge request easycorp/zentaopms!6882
 2023-02-08 08:27:48 +00:00
王怡栋 1a75e7b690 Merge branch 'sprint/hufangzhou_181_package' into 'master' 
* Add the new version.

See merge request easycorp/zentaopms!6879
 2023-02-08 02:49:54 +00:00
王怡栋 552222709a Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix bug #24872.

See merge request easycorp/zentaopms!6877
 2023-02-08 02:22:50 +00:00
王怡栋 1148adad0c Merge branch 'dev/gfl_add_class_admin-tab-menu' into 'master' 
* Code for add class admin-tab-menu

See merge request easycorp/zentaopms!6878
 2023-02-08 02:22:24 +00:00
王怡栋 fd92f0e6ae Merge branch 'zenops_61' into 'master' 
Zenops 61

See merge request easycorp/zentaopms!6876
 2023-02-08 01:55:38 +00:00
王怡栋 b8b5a62427 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix bug #24665.

See merge request easycorp/zentaopms!6875
 2023-02-08 01:53:25 +00:00
王怡栋 9ee0326acf Merge branch 'master_xieqiyu_31949' into 'master' 
Master xieqiyu 31949

See merge request easycorp/zentaopms!6873
 2023-02-08 01:52:56 +00:00
王怡栋 1bd84b68c7 Merge branch 'bugfix/liwenrui/chatavatarpermission' into 'master' 
修复禅道客户端中上传群头像功能可能无权使用的问题

See merge request easycorp/zentaopms!6871
 2023-02-07 06:56:40 +00:00
王怡栋 a1aa283d77 Merge branch 'master_xieqiyu_31948' into 'master' 
* Code for bug#31948.

See merge request easycorp/zentaopms!6872
 2023-02-07 06:56:13 +00:00
王怡栋 a3580b9526 Merge branch 'dev/gfl_task_#83732' into 'master' 
Dev/gfl task #83732

See merge request easycorp/zentaopms!6870
 2023-02-07 06:53:05 +00:00
王怡栋 64a0c67f38 Merge branch 'ticket_330' into 'master' 
Ticket 330

See merge request easycorp/zentaopms!6866
 2023-02-07 03:09:06 +00:00
王怡栋 d98c613ff6 Merge branch 'ticket_325' into 'master' 
* Adjuct code for feedback #1836.

See merge request easycorp/zentaopms!6867
 2023-02-07 03:08:48 +00:00
王怡栋 45d1ee9054 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix webhook content is markdown bug.

See merge request easycorp/zentaopms!6868
 2023-02-07 03:08:09 +00:00
王怡栋 388ae5dae0 Merge branch 'dev/gfl_task_#83732' into 'master' 
* Code for task #83732

See merge request easycorp/zentaopms!6869
 2023-02-07 03:07:52 +00:00
王怡栋 ac066acdc9 Merge branch 'master_xieqiyu_83681' into 'master' 
* Code for task#83681.

See merge request easycorp/zentaopms!6863
 2023-02-06 09:23:47 +00:00
王怡栋 26fa30840f Merge branch 'zentaopms_wangyuting2' into 'master' 
* Finish task #84089. Fix bug #31946.

See merge request easycorp/zentaopms!6862
 2023-02-06 09:23:33 +00:00
王怡栋 6d105678b0 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix the bug of not updating the weekly report.

See merge request easycorp/zentaopms!6860
 2023-02-06 09:20:09 +00:00
王怡栋 91b5f22ed9 Merge branch 'dev/gfl_fix_style_bug_in_browseList' into 'master' 
* Code for change pd-l in a to pd-r in icon

See merge request easycorp/zentaopms!6859
 2023-02-06 09:18:39 +00:00
wangyidong 9b2050098d * fix bug #29748. 2023-02-03 17:17:39 +08:00
王怡栋 9d34521ef7 Merge branch 'master_xieqiyu_28270' into 'master' 
* Code for bug#28270.

See merge request easycorp/zentaopms!6858
 2023-02-03 09:14:46 +00:00
王怡栋 ca09570077 Merge branch 'dev/gfl_my_preference_css_refactors' into 'master' 
* Code for css in preference.html.php .

See merge request easycorp/zentaopms!6857
 2023-02-03 09:14:09 +00:00
王怡栋 b1bd43c331 Merge branch 'master_bug_30389' into 'master' 
* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug...

See merge request easycorp/zentaopms!6852
 2023-02-03 07:59:06 +00:00
王怡栋 3ec34c9acd Merge branch 'master_xieqiyu_28704' into 'master' 
* Code for bug#28704.

See merge request easycorp/zentaopms!6856
 2023-02-03 06:46:28 +00:00
王怡栋 bc3ba1e05c Merge branch 'zentaopms284_bug#25538' into 'master' 
* Fix bug #25538.

See merge request easycorp/zentaopms!6854
 2023-02-03 06:39:06 +00:00
王怡栋 f6264aed8c Merge branch 'ticket_324' into 'master' 
* Adjuct for ticket 324.

See merge request easycorp/zentaopms!6853
 2023-02-03 06:36:09 +00:00
王怡栋 c1ea319bcd Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master' 
* Code for style problem in flowchart

See merge request easycorp/zentaopms!6855
 2023-02-03 06:28:02 +00:00
王怡栋 4f3fa1662f Merge branch 'master_xieqiyu_30064' into 'master' 
* Code for bug#30064.

See merge request easycorp/zentaopms!6849
 2023-02-03 02:07:42 +00:00
王怡栋 5e6a2e6026 Merge branch 'dev/gfl_updateCssFile_zui' into 'master' 
* Code for css in admin theme.

See merge request easycorp/zentaopms!6851
 2023-02-03 02:05:38 +00:00
wangyidong 1f1e8b0836 * fix bug #31519. 2023-02-03 08:48:18 +08:00
王怡栋 db6eaa622f Merge branch 'dev/gfl_add_icon_horn_and_download-alt' into 'master' 
* code for add icon download-alt and horn

See merge request easycorp/zentaopms!6848
 2023-02-02 08:57:33 +00:00
王怡栋 3f9c3e40e1 Merge branch 'zentaopms284_bug#31889' into 'master' 
* Fix bug #31889.

See merge request easycorp/zentaopms!6846
 2023-02-02 08:57:17 +00:00
王怡栋 2cbb844240 Merge branch 'sprint/f2039' into 'master' 
* Fix feedback2039.

See merge request easycorp/zentaopms!6844
 2023-02-02 08:53:20 +00:00
王怡栋 ee5db15cd3 Merge branch 'hufangzhou_autopack' into 'master' 
* Add the mark for auto pack, and integrate the table creation statement.

See merge request easycorp/zentaopms!6847
 2023-02-02 08:52:53 +00:00
wangyidong 81820d5145 * fix bug #31887. 2023-02-02 16:00:42 +08:00
王怡栋 5c019e1a81 Merge branch 'dev/gfl_updatecssFile_zui' into 'master' 
* code for theme class in task #83327

See merge request easycorp/zentaopms!6842
 2023-02-02 06:45:56 +00:00
王怡栋 330da9b6b2 Merge branch 'master_bug' into 'master' 
*Fix the testtask and testcase creatBug open new label.

See merge request easycorp/zentaopms!6841
 2023-02-02 06:45:31 +00:00
王怡栋 a2f9c43632 Merge branch 'master_xieqiyu_31453' into 'master' 
* Code for bug#31453.

See merge request easycorp/zentaopms!6840
 2023-02-02 06:44:43 +00:00
王怡栋 34ccab2ae9 Merge branch 'master_xieqiyu_31453' into 'master' 
* Fix bug#31453.

See merge request easycorp/zentaopms!6838
 2023-02-02 05:48:39 +00:00
王怡栋 d0c837df51 Merge branch 'master_xieqiyu_30968' into 'master' 
* Fix bug#30968.

See merge request easycorp/zentaopms!6837
 2023-02-02 05:46:18 +00:00
王怡栋 939089b325 Merge branch 'sprint/fixbug_tanghucheng' into 'master' 
* Fix bug #25334.

See merge request easycorp/zentaopms!6836
 2023-02-02 05:45:48 +00:00
王怡栋 aea7178985 Merge branch 'sprint/feedback2047' into 'master' 
* Fix feedback 2047.

See merge request easycorp/zentaopms!6834
 2023-02-02 01:24:36 +00:00
王怡栋 f98b046674 Merge branch 'master_bug_30814' into 'master' 
* Fix bug #30814

See merge request easycorp/zentaopms!6833
 2023-02-02 01:24:04 +00:00
王怡栋 183929538c Merge branch 'bugfix/workflowFile20230201' into 'master' 
* Resolved feedback #2065, workflow extend file type field can not linkage.

See merge request easycorp/zentaopms!6835
 2023-02-02 01:20:04 +00:00
王怡栋 182ce3e6a3 Merge branch 'master_xieqiyu_30144' into 'master' 
* Fix bug#30144.

See merge request easycorp/zentaopms!6826
 2023-02-01 09:16:20 +00:00
王怡栋 0be2cc5302 Merge branch 'master_xieqiyu_31864' into 'master' 
* Fix bug#31864.

See merge request easycorp/zentaopms!6824
 2023-02-01 09:15:40 +00:00
王怡栋 78c6c67a55 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6823
 2023-02-01 09:15:12 +00:00
王怡栋 6da21196a9 Merge branch 'master_xieqiyu_30280' into 'master' 
* Fix bug#30280.

See merge request easycorp/zentaopms!6822
 2023-02-01 09:14:21 +00:00
王怡栋 5340535915 Merge branch 'sprint/hufangzhou_bug_30770' into 'master' 
* Fix bug #30770.

See merge request easycorp/zentaopms!6830
 2023-02-01 09:12:24 +00:00
王怡栋 84ea957712 Merge branch 'master_xieqiyu_30834' into 'master' 
* Fix bug#30834.

See merge request easycorp/zentaopms!6820
 2023-02-01 06:28:30 +00:00
王怡栋 3c316330d1 Merge branch 'master_xieqiyu_30859' into 'master' 
* Fix bug#30859.

See merge request easycorp/zentaopms!6819
 2023-02-01 06:28:14 +00:00
王怡栋 fb0ffba7a2 Merge branch 'master_xieqiyu_31366' into 'master' 
* Fix bug#31366.

See merge request easycorp/zentaopms!6818
 2023-02-01 06:27:20 +00:00
王怡栋 a02b41962e Merge branch 'zentaopms284_wangyuting' into 'master' 
* Adjust modal width.

See merge request easycorp/zentaopms!6815
 2023-02-01 06:26:48 +00:00
王怡栋 0933b65d15 Merge branch 'zentaopms_284_task_#83032' into 'master' 
* Finish task #83032.

See merge request easycorp/zentaopms!6813
 2023-02-01 06:26:36 +00:00
王怡栋 f0f2784b42 Merge branch 'zentaopms284_bug#77615' into 'master' 
* Fix bug #77615.

See merge request easycorp/zentaopms!6808
 2023-01-31 03:18:38 +00:00
王怡栋 8e40414917 Merge branch 'master_bug_30389' into 'master' 
* Adjust code logic for 30389.

See merge request easycorp/zentaopms!6807
 2023-01-31 03:18:20 +00:00
王怡栋 b584104430 Merge branch 'sprint/hidedropmenu' into 'master' 
* Hide drop-down menu when click one item.

See merge request easycorp/zentaopms!6806
 2023-01-31 03:18:03 +00:00
王怡栋 27d762ff59 Merge branch 'zentaopms284_wangyuting' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!6803
 2023-01-31 00:48:35 +00:00
王怡栋 b75714f5b1 Merge branch 'zentaopms_284_task_#83030' into 'master' 
* Finish task #83030.

See merge request easycorp/zentaopms!6800
 2023-01-30 08:03:30 +00:00
王怡栋 6e2288d96d Merge branch 'zentaopms284_task#82065' into 'master' 
* Send an email to the dispatcher when closing a bug or requirement.

See merge request easycorp/zentaopms!6801
 2023-01-30 08:02:48 +00:00
wangyidong 516d773d1d * fix bug #31718. 2023-01-30 09:01:15 +08:00
王怡栋 73bc6538d0 Merge branch 'tianshujie_fixbug' into 'master' 
Tianshujie fixbug

See merge request easycorp/zentaopms!6794
 2023-01-30 00:37:19 +00:00
wangyidong b4598b8738 * fix bug #31725. 2023-01-29 17:18:40 +08:00
王怡栋 5ce0bb3c97 Merge branch 'master_bug_30389' into 'master' 
* Fix bug #30389 :if delete execution directly the execute is empty.

See merge request easycorp/zentaopms!6793
 2023-01-29 08:49:21 +00:00
王怡栋 10371d204b Merge branch 'sprint/hufangzhou_jenkinsTest' into 'master' 
* Modify for trigger jenkins.

See merge request easycorp/zentaopms!6792
 2023-01-29 07:44:57 +00:00
王怡栋 87480efae9 Merge branch 'tianshujie_fixbug' into 'master' 
Tianshujie fixbug

See merge request easycorp/zentaopms!6791
 2023-01-29 07:28:22 +00:00
wangyidong 04d62866f2 * fix bug #26541. 2023-01-29 14:49:02 +08:00
王怡栋 3a2c5a4b00 Merge branch 'sprint/tsj_uinttest' into 'master' 
* Add test case and remove unused function.

See merge request easycorp/zentaopms!6788
 2023-01-29 06:37:57 +00:00
王怡栋 dcc2392506 Merge branch 'master_bug_30389' into 'master' 
* Fix bug #30389.

See merge request easycorp/zentaopms!6787
 2023-01-29 05:08:18 +00:00
王怡栋 3ed4d5d692 Merge branch 'zenops_46' into 'master' 
Merge branch zenops_46 into  'master'

See merge request easycorp/zentaopms!6784
 2023-01-29 05:07:38 +00:00
王怡栋 16af42a553 Merge branch 'bug_31595' into 'master' 
* Fix bug#31595

See merge request easycorp/zentaopms!6783
 2023-01-29 05:07:06 +00:00
王怡栋 c2efcc5bd1 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6773
 2023-01-29 05:06:44 +00:00
王怡栋 f3595c32de Merge branch 'master_bug_30334' into 'master' 
* Adjust code  bug #30334.

See merge request easycorp/zentaopms!6770
 2023-01-29 05:05:11 +00:00