Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,510 Commits 2 Branches 292 Tags
ffe1ccdbe8e418f7882beebaced83de2cdef0910
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 1856a26312 Merge branch 'dev/gfl_task_#83327' into 'sprint/285' 
* code for task #83327

See merge request easycorp/zentaopms!6798
 2023-01-30 08:04:43 +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
wangyidong bf1130cff7 * fix bug for create linked2revision action. 2023-01-13 17:39:02 +08:00
王怡栋 073fad1bea Merge branch 'bugfix/excelImport' into 'master' 
Fix feedback #1967, when import record ge 100 sub task error.

See merge request easycorp/zentaopms!6768
 2023-01-13 07:52:11 +00:00
王怡栋 14948a345e Merge branch 'bug_31517' into 'master' 
* Fix bug#31517

See merge request easycorp/zentaopms!6762
 2023-01-13 07:11:47 +00:00
王怡栋 6b33586e1e Merge branch 'sprint/weibufeedback' into 'master' 
* Fix can bypass permissions.

See merge request easycorp/zentaopms!6765
 2023-01-13 07:08:23 +00:00
王怡栋 879b06b074 Merge branch 'feedback_1954' into 'master' 
* Resolve feedback#1954

See merge request easycorp/zentaopms!6763
 2023-01-13 07:07:42 +00:00
王怡栋 7b83232b17 Merge branch 'zenops_46' into 'master' 
Merge Zenops 46 into master

See merge request easycorp/zentaopms!6759
 2023-01-13 07:05:17 +00:00
wangyidong a044694678 Merge branch 'sprint/hufangzhou_user_unit' 2023-01-11 17:02:51 +08:00
王怡栋 cac39118cb Merge branch 'master' into 'sprint/hufangzhou_user_unit' 
# Conflicts:
#   test/class/user.class.php
 2023-01-11 09:02:25 +00:00
王怡栋 64799a5082 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6752
 2023-01-11 09:00:10 +00:00
王怡栋 10ece401cc Merge branch 'sprint/hufangzhou_user_identifyby' into 'master' 
* Add the identifybycookie and identifybyphpauth unit testcase.

See merge request easycorp/zentaopms!6750
 2023-01-11 08:59:19 +00:00
王怡栋 7756949675 Merge branch 'sprint/hufangzhou_user_getparentstageauthedusers' into 'master' 
* Modify the getparentstageauthedusers unit testcase.

See merge request easycorp/zentaopms!6748
 2023-01-11 08:58:53 +00:00
王怡栋 499294685d Merge branch 'sprint/hufangzhou_user_getlistbyaccount' into 'master' 
* Add the getlistbyaccount unit testcase.

See merge request easycorp/zentaopms!6747
 2023-01-11 08:58:36 +00:00
王怡栋 b2f1b7aa00 Merge branch 'sprint/hufangzhou_user_getcontactlists' into 'master' 
* Modify the getcontactlists unit testcase.

See merge request easycorp/zentaopms!6746
 2023-01-11 08:58:06 +00:00
王怡栋 c5bd66918f Merge branch 'bugfix/importWorkflowFiledError' into 'master' 
* Reloved feedback #1940 , import error if field is extend by workflow.

See merge request easycorp/zentaopms!6745
 2023-01-10 09:22:13 +00:00
王怡栋 fc0bf0b475 Merge branch 'sprint/hufangzhou_user_getcontactlistbyid' into 'master' 
* Modify the getcontactlistbyid unit testcase.

See merge request easycorp/zentaopms!6743
 2023-01-10 09:21:59 +00:00
王怡栋 6a214f851a Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6741
 2023-01-10 09:21:44 +00:00
王怡栋 cbf0d9839f Merge branch 'sprint/hufangzhou_user_cleanlocked' into 'master' 
* Add the cleanlocked unit testcase.

See merge request easycorp/zentaopms!6740
 2023-01-10 09:21:00 +00:00
王怡栋 14fa294219 Merge branch 'liuruogu_unittest' into 'master' 
* Add unit test for user.

See merge request easycorp/zentaopms!6738
 2023-01-10 01:10:51 +00:00
王怡栋 184f2b3a5a Merge branch 'sprint/hufangzhou_user_getobjects' into 'master' 
* Modify the unit testcase of getObjects.

See merge request easycorp/zentaopms!6736
 2023-01-10 01:10:16 +00:00
王怡栋 39288b5498 Merge branch 'sprint/hufangzhou_user_authorize' into 'master' 
* Add the unit testcase of authorize.

See merge request easycorp/zentaopms!6734
 2023-01-10 01:09:57 +00:00
王怡栋 6038b7c298 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6737
 2023-01-10 01:08:29 +00:00
王怡栋 d9abd19c2d Merge branch 'zentaopms_283_task_#82067' into 'master' 
* Finish task #82067.

See merge request easycorp/zentaopms!6730
 2023-01-09 00:25:33 +00:00
王怡栋 7fe559597f Merge branch 'zentaopms_283_fix_task_#82075' into 'master' 
* Finish task #82075.

See merge request easycorp/zentaopms!6729
 2023-01-09 00:25:09 +00:00
wangyidong 49c392d16a Merge branch 'zentaopms_283_task_#82064' 2023-01-09 08:24:11 +08:00
王怡栋 0b625878de Merge branch 'master' into 'zentaopms_283_task_#82064' 
# Conflicts:
#   module/story/view/view.html.php
 2023-01-09 00:23:49 +00:00
王怡栋 b6f3986894 Merge branch 'zentaopms_283' into 'master' 
Zentaopms 283

See merge request easycorp/zentaopms!6725
 2023-01-06 08:31:14 +00:00
王怡栋 91f38d82f5 Merge branch 'zentaopms_283_task_#82058' into 'zentaopms_283' 
* Finish task #82058.

See merge request easycorp/zentaopms!6723
 2023-01-06 07:37:28 +00:00
王怡栋 f4b70ec8c7 Merge branch 'zg_bug' into 'master' 
* Adjust code

See merge request easycorp/zentaopms!6722
 2023-01-06 07:37:03 +00:00
王怡栋 cb8d6ea6af Merge branch 'sprint/hufangzhou_user_getgroupsbyvisions' into 'master' 
* Modify the getgroupsbyvisions unit testcase.

See merge request easycorp/zentaopms!6721
 2023-01-06 06:54:35 +00:00
王怡栋 90f458cc41 Merge branch 'sprint/hufangzhou_user_getgroups' into 'master' 
* Modify the getgroups unit testcase.

See merge request easycorp/zentaopms!6719
 2023-01-06 06:54:18 +00:00
王怡栋 4f37519422 Merge branch 'sprint/hufangzhou_user_login' into 'master' 
* Modify the login unit testcase.

See merge request easycorp/zentaopms!6718
 2023-01-06 06:54:03 +00:00
王怡栋 4e3f7ad8e8 Merge branch 'sprint/tsj_uinttest' into 'master' 
* Add test data.

See merge request easycorp/zentaopms!6714
 2023-01-06 06:53:27 +00:00
王怡栋 99cee07194 Merge branch 'zentaopms_283_task_#82068' into 'zentaopms_283' 
* Finish task #82068.

See merge request easycorp/zentaopms!6711
 2023-01-06 06:52:59 +00:00
王怡栋 703a689309 Merge branch 'zentaopms_283_task_#82070' into 'zentaopms_283' 
* Finish task #82070.

See merge request easycorp/zentaopms!6707
 2023-01-06 03:08:56 +00:00
王怡栋 0002481dc9 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6710
 2023-01-06 03:08:40 +00:00
王怡栋 de392f3662 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6704
 2023-01-06 00:36:45 +00:00
王怡栋 438a388370 Merge branch 'sprint/hufangzhou_user_identify' into 'master' 
* Add the unit testcase of identify method.

See merge request easycorp/zentaopms!6703
 2023-01-05 23:02:52 +00:00
王怡栋 b0c62ecd41 Merge branch 'feedback_1869' into 'master' 
* Resolve feedback#1869

See merge request easycorp/zentaopms!6698
 2023-01-05 23:02:35 +00:00
王怡栋 beba02ff3f Merge branch 'zentaopms_283_task_#82073' into 'zentaopms_283' 
* Finish task #82073.

See merge request easycorp/zentaopms!6695
 2023-01-05 03:11:17 +00:00
王怡栋 c9f961b573 Merge branch 'sprint/wangzemei/28228' into 'master' 
* Fix bug 28228

See merge request easycorp/zentaopms!6694
 2023-01-05 03:10:56 +00:00
王怡栋 de8493412a Merge branch 'cyy_bug' into 'master' 
* Modify job edit error tip.

See merge request easycorp/zentaopms!6689
 2023-01-05 02:55:34 +00:00
王怡栋 a721827b0a Merge branch 'sprint/hufangzhou_bug_31444' into 'master' 
* Fix bug #31444.

See merge request easycorp/zentaopms!6687
 2023-01-05 02:55:18 +00:00
王怡栋 a846499f92 Merge branch 'zentaopms_283_task_#82075' into 'zentaopms_283' 
* Finish task #82075.

See merge request easycorp/zentaopms!6686
 2023-01-04 08:39:03 +00:00
wangyidong 2f03f91cf4 * adjust code. 2023-01-04 13:31:58 +08:00
wangyidong 9d013b80c5 * fix bug for compute weekly. 2023-01-04 10:28:52 +08:00
王怡栋 5eb1b82ea0 Merge branch 'cyy_bug' into 'master' 
* Fix bug #31381.

See merge request easycorp/zentaopms!6675
 2023-01-04 02:21:36 +00:00
王怡栋 0914d265f7 Merge branch 'sprint/wangzemei/kanban' into 'master' 
* fix kanban css

See merge request easycorp/zentaopms!6673
 2023-01-04 02:09:10 +00:00
王怡栋 99a5a7cfaf Merge branch 'sprint/hufangzhou_misclang' into 'master' 
* Add the desc of new version.

See merge request easycorp/zentaopms!6670
 2023-01-03 07:42:31 +00:00
王怡栋 a17823fe7e Merge branch 'sprint/wangzemei/css_kanban' into 'master' 
* fix css of kanban

See merge request easycorp/zentaopms!6671
 2023-01-03 07:42:16 +00:00
王怡栋 62d60df7bd Merge branch 'sprint/hufangzhou_newVersion' into 'master' 
* Add the new version.

See merge request easycorp/zentaopms!6668
 2023-01-03 06:09:21 +00:00
王怡栋 0a41c01b88 Merge branch 'cyy_bug' into 'master' 
Cyy bug

See merge request easycorp/zentaopms!6666
 2023-01-03 05:35:16 +00:00
王怡栋 08bc53afb5 Merge branch 'zenops_46' into 'master' 
Merge branch 'zenops_46' into master

See merge request easycorp/zentaopms!6662
 2023-01-03 05:34:51 +00:00
王怡栋 f0e21c3f74 Merge branch 'cyy_bug' into 'master' 
Cyy bug

See merge request easycorp/zentaopms!6661
 2023-01-03 01:54:41 +00:00
王怡栋 aef16e3c83 Merge branch 'sprint/gfl_task_40825' into 'master' 
* code for task #40827

See merge request easycorp/zentaopms!6659
 2023-01-03 01:54:28 +00:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
王怡栋 99470be30e Merge branch 'cyy_optimize' into 'master' 
* Modify text style.

See merge request easycorp/zentaopms!6658
 2022-12-30 07:19:05 +00:00
wangyidong be81b08952 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-30 14:48:49 +08:00
wangyidong 6a27d4d272 Merge branch 'feedback_1796' 2022-12-30 14:48:08 +08:00
wangyidong f85db70c20 * adjust for save weekly. 2022-12-30 14:46:20 +08:00
王怡栋 913eb916f2 Merge branch 'feekback#1865' into 'master' 
* Resolved feedback #1865, create project error when chose no sprint type and...

See merge request easycorp/zentaopms!6655
 2022-12-30 05:32:15 +00:00
wangyidong 7c3958183f * code for task #81412,81413. 2022-12-29 15:33:40 +08:00
王怡栋 fc1964e8a8 Merge branch 'sprint/feedback1843' into 'master' 
* Fix feedback1843.

See merge request easycorp/zentaopms!6646
 2022-12-29 00:17:45 +00:00
王怡栋 c44ac23c73 Merge branch 'sprint/bi_liumengyi_fixbug' into 'master' 
* Fix bug #31276.

See merge request easycorp/zentaopms!6644
 2022-12-29 00:17:16 +00:00
王怡栋 ddb801568b Merge branch 'feedback_1704' into 'master' 
* Resolve feedback#1704

See merge request easycorp/zentaopms!6643
 2022-12-29 00:16:39 +00:00
wangyidong 56c5cac759 * code for task #81410. 2022-12-28 14:32:22 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!6640
 2022-12-27 08:48:41 +00:00
wangyidong aed2c5e2a2 * code for task #81417. 2022-12-27 11:01:08 +08:00
wangyidong 2da63834b3 * code for task #81407,81416,81417. 2022-12-27 10:53:23 +08:00
王怡栋 8da7e6ab2a Merge branch 'sprint/hufangzhou_fixbug' into 'master' 
* Fix bug for add module.

See merge request easycorp/zentaopms!6637
 2022-12-27 01:31:29 +00:00
王怡栋 0692155514 Merge branch 'zentaopms_279_bug#31190' into 'master' 
* Fix bug #31190.

See merge request easycorp/zentaopms!6636
 2022-12-27 01:30:51 +00:00
王怡栋 9e13bd16c3 Merge branch 'sprint/hufangzhou_newVersion_BI' into 'master' 
* Add the new Version.

See merge request easycorp/zentaopms!6635
 2022-12-27 01:08:12 +00:00
王怡栋 b520d3333e Merge branch 'sprint/scx_gfl_something' into 'master' 
* Fix bug for story finished percent.

See merge request easycorp/zentaopms!6632
 2022-12-26 08:49:13 +00:00
wangyidong 489d7aa695 * fix bug save lastExecution. 2022-12-26 16:21:09 +08:00
王怡栋 681e43fbb4 Merge branch 'sprint/bi_liumengyi_sortPie' into 'master' 
* Sort data in build pie chart.

See merge request easycorp/zentaopms!6629
 2022-12-26 07:24:41 +00:00
王怡栋 c6307dd6eb Merge branch 'sprint/scx_gfl_something' into 'master' 
Sprint/scx gfl something

See merge request easycorp/zentaopms!6631
 2022-12-26 07:24:31 +00:00
王怡栋 130cdfcbba Merge branch 'sprint/wangzemei/28210' into 'master' 
* fix bug 28210

See merge request easycorp/zentaopms!6626
 2022-12-26 03:03:54 +00:00
王怡栋 4b76e66c31 Merge branch 'sprint/feedback1821' into 'master' 
* Fix feedback1821.

See merge request easycorp/zentaopms!6624
 2022-12-26 03:03:41 +00:00
王怡栋 0a551cdc98 Merge branch 'bug_26051' into 'master' 
* Fix bug#26051

See merge request easycorp/zentaopms!6622
 2022-12-26 03:02:10 +00:00
王怡栋 6e07ab9383 Merge branch 'sprint/278_tsj_fixbug' into 'sprint/272' 
Sprint/278 tsj fixbug

See merge request easycorp/zentaopms!6627
 2022-12-26 03:01:37 +00:00
王怡栋 c7396478aa Merge branch 'sprint/scx_screen' into 'master' 
* Filter execution status.

See merge request easycorp/zentaopms!6628
 2022-12-26 03:01:03 +00:00
wangyidong f0b1d7fbd2 * fix bug #29812. 2022-12-23 13:58:08 +08:00
wangyidong f40926eed2 * fix bug #29852. 2022-12-23 12:04:57 +08:00
wangyidong 177dcb534f * fix bug #29951. 2022-12-23 11:53:02 +08:00
wangyidong a65844d582 * fix bug #30008. 2022-12-23 10:48:15 +08:00
wangyidong 0a3df6b5ec * fix bug #30254. 2022-12-23 10:21:12 +08:00
wangyidong 13e8ae5728 * adjust code. 2022-12-23 08:11:36 +08:00