Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,642 Commits 2 Branches 292 Tags
6d9ba865ba552bb32cf271086e73f726405d829a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 6d9ba865ba Merge branch '230' into 'sprint/zentaopms230' 
* Code for weekly.

See merge request easycorp/zentaopms!4980
 2022-08-16 06:06:38 +00:00
wangyidong 95ef309921 * code for task #65279. 2022-08-16 13:39:25 +08:00
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
wangyidong ab83e773d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 17:57:14 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
王怡栋 d1ccbe14ae Merge branch 'sprint/liuruogu_fixbug#26456' into 'master' 
* Fix bug #26456.

See merge request easycorp/zentaopms!4974
 2022-08-15 09:28:11 +00:00
王怡栋 2afc943171 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug gantt menu

See merge request easycorp/zentaopms!4972
 2022-08-15 07:42:31 +00:00
wangyidong 474662047c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 15:11:37 +08:00
wangyidong cab10571b3 * adjust for after exec page. 2022-08-15 15:11:06 +08:00
王怡栋 704901e7e0 Merge branch 'sprint/hufangzhou_BI' into 'master' 
* Add the BI sql to standard sql.

See merge request easycorp/zentaopms!4969
 2022-08-15 06:01:01 +00:00
王怡栋 3aff3d70b5 Merge branch 'importExport' into 'master' 
* Fix bug #26419,26417.

See merge request easycorp/zentaopms!4968
 2022-08-15 06:00:38 +00:00
wangyidong e891a32291 * File ui.flow.html.hook.php can not delete. 2022-08-15 13:50:39 +08:00
wangyidong 811c1d2ad6 * adjust for change table engine. 2022-08-15 13:04:24 +08:00
wangyidong 1e5558d383 * adjust for search. 2022-08-15 11:06:34 +08:00
王怡栋 a84ae59d3b Merge branch 'sprint/hufangzhou_xuansql' into 'master' 
* Add the xuan update sql to zentao.sql.

See merge request easycorp/zentaopms!4967
 2022-08-15 02:55:05 +00:00
王怡栋 72b8148159 Merge branch 'master_liwenrui_bugfix_zentaoclient_card' into 'master' 
* fix style of dialogs in zentaoclient.

See merge request easycorp/zentaopms!4964
 2022-08-15 00:23:47 +00:00
王怡栋 be900dfbbc Merge branch 'sprint224_zg_unit' into 'master' 
* Adjust unit code

See merge request easycorp/zentaopms!4960
 2022-08-15 00:21:12 +00:00
王怡栋 63dae91a00 Merge branch 'importExport' into 'master' 
* Code for Import export

See merge request easycorp/zentaopms!4963
 2022-08-15 00:14:35 +00:00
王怡栋 55ebeb33d2 Merge branch 'sprint/max41_mayue_bug#26395' into 'master' 
* Fix bug #26395.

See merge request easycorp/zentaopms!4954
 2022-08-12 09:06:52 +00:00
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
add cp gantt task move

See merge request easycorp/zentaopms!4953
 2022-08-12 09:06:24 +00:00
王怡栋 0b2e1e3db5 Merge branch 'sprint/224_hufangzhou_adjustChangelog' into 'master' 
* Add the xxc to changelog.

See merge request easycorp/zentaopms!4957
 2022-08-12 09:03:13 +00:00
王怡栋 71093a980c Merge branch 'sprint/224_dongli_bug26194' into 'master' 
* Fix bug #26194.

See merge request easycorp/zentaopms!4950
 2022-08-12 08:49:11 +00:00
wangyidong ab98851096 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:43:33 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
王怡栋 38f8f8c0ba Merge branch 'master_xieqiyu_26177' into 'master' 
* Fix bug#26177.

See merge request easycorp/zentaopms!4946
 2022-08-12 08:19:02 +00:00
王怡栋 534b2540d2 Merge branch 'sprint224_26389' into 'master' 
* Fix bug#26389,26333,26328

See merge request easycorp/zentaopms!4947
 2022-08-12 08:17:54 +00:00
wangyidong ab06fa28ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-12 16:12:08 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
王怡栋 5d1db2ce0f Merge branch 'sprint/224_tianshujie_fixbug' into 'master' 
* Operations type execution and story or design type stage do not display story field.

See merge request easycorp/zentaopms!4948
 2022-08-12 07:01:47 +00:00
王怡栋 d32cf5d6e2 Merge branch 'sprint/224_liumengyi_26325' into 'master' 
* Fix bug #26325.

See merge request easycorp/zentaopms!4945
 2022-08-12 06:28:45 +00:00
王怡栋 9e8fddafa6 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!4943
 2022-08-12 00:49:55 +00:00
王怡栋 1c95b63d7b Merge branch 'importExport' into 'master' 
* Format code for port.

See merge request easycorp/zentaopms!4944
 2022-08-12 00:49:44 +00:00
wangyidong 1d1379392a * adjust for merge program. 2022-08-12 08:34:37 +08:00
王怡栋 f1e13457e5 Merge branch 'sprint224_zg_26307' into 'master' 
* Fix bug #26307

See merge request easycorp/zentaopms!4931
 2022-08-12 00:31:55 +00:00
王怡栋 2f2718e409 Merge branch 'sprint/224_hufangzhou_changelog' into 'master' 
* Modify the changelog.

See merge request easycorp/zentaopms!4941
 2022-08-12 00:28:58 +00:00
王怡栋 6c24a5aad1 Merge branch 'importExport' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4942
 2022-08-12 00:28:44 +00:00
王怡栋 d99af116f9 Merge branch 'importExport' into 'master' 
* Fix bug #26324.

See merge request easycorp/zentaopms!4937
 2022-08-11 09:00:13 +00:00
王怡栋 af417a81fb Merge branch 'sprint/unitteest_liumengyi_build' into 'master' 
* Fix unit test of build.

See merge request easycorp/zentaopms!4935
 2022-08-11 08:21:13 +00:00
王怡栋 df6dbae7eb Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
remove image

See merge request easycorp/zentaopms!4934
 2022-08-11 08:20:29 +00:00
王怡栋 15d3c5f680 Merge branch 'sprint/224_dongli_bug63665' into 'master' 
* Fix bug #63665.

See merge request easycorp/zentaopms!4933
 2022-08-11 08:20:16 +00:00
王怡栋 821f011e90 Merge branch 'importExport' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4932
 2022-08-11 08:04:27 +00:00
wangyidong 02bab0a206 Merge branch 'sprint/devplat_31' 2022-08-11 15:21:36 +08:00
wangyidong 1915ef01e5 * fix for get plans when no product. 2022-08-11 14:21:22 +08:00
wangyidong d4ed167e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-11 14:12:52 +08:00
wangyidong 579d614d77 Merge branch 'sprint/devplat_31' 2022-08-11 14:12:44 +08:00
王怡栋 0125b85cd4 Merge branch 'sprint/master_guofeilong_fixbug_261443' into 'master' 
Sprint/master guofeilong fixbug 261443

See merge request easycorp/zentaopms!4925
 2022-08-11 06:00:45 +00:00
王怡栋 61f3904ff0 Merge branch 'sprint/devplat_31' into 'master' 
* Add flow fields when upgrade from biz7.3.

See merge request easycorp/zentaopms!4922
 2022-08-11 05:20:51 +00:00
王怡栋 fd4ad2daaa Merge branch 'sprint/hufangzhou_updateLang' into 'master' 
* Modify the lang item.

See merge request easycorp/zentaopms!4921
 2022-08-11 04:12:06 +00:00
王怡栋 dca269ee84 Merge branch 'importExport' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4918
 2022-08-11 04:11:23 +00:00
王怡栋 8e722c7d98 Merge branch 'master_xieqiyu_63769' into 'master' 
* Finish task#63769.

See merge request easycorp/zentaopms!4916
 2022-08-11 04:10:48 +00:00
王怡栋 8901f60b25 Merge branch 'sprint/224_liumengyi_fixbug' into 'master' 
* Fix bug #26246.

See merge request easycorp/zentaopms!4917
 2022-08-11 02:26:49 +00:00
王怡栋 1ccc55aea4 Merge branch 'fix_bug#25891' into 'master' 
* Fix bug 25891.

See merge request easycorp/zentaopms!4915
 2022-08-11 02:15:29 +00:00
王怡栋 0fca3e9f13 Merge branch 'leiyong_fix_bug_0811' into 'master' 
* Fix single sign-on.

See merge request easycorp/zentaopms!4914
 2022-08-11 02:15:16 +00:00
王怡栋 93947c8127 Merge branch 'sprint/master_zhouxudong_26294' into 'master' 
* Fix bug #26294.

See merge request easycorp/zentaopms!4913
 2022-08-11 02:15:06 +00:00
王怡栋 ce74ee1f30 Merge branch 'sprint/max41_mayue_bug#26242' into 'master' 
Sprint/max41 mayue bug#26242

See merge request easycorp/zentaopms!4911
 2022-08-11 02:14:55 +00:00
王怡栋 96821f5be9 Merge branch 'sprint/224_liumengyi_fixbug' into 'master' 
* Add bug test unit.

See merge request easycorp/zentaopms!4909
 2022-08-11 01:32:38 +00:00
wangyidong 124b8fdc01 Merge branch 'master_liuhong_63787' 2022-08-11 09:23:14 +08:00
王怡栋 7c2d2b54eb Merge branch 'master' into 'master_liuhong_63787' 
# Conflicts:
#   module/program/css/browse.css
#   module/project/css/browse.css
 2022-08-11 01:22:50 +00:00
王怡栋 59c325d565 Merge branch 'sprint/224_dongli_63669' into 'master' 
* Fix bug #63669.

See merge request easycorp/zentaopms!4908
 2022-08-11 01:19:17 +00:00
wangyidong 289ee7b1b1 * adjust for api. 2022-08-11 09:01:43 +08:00
王怡栋 d4724e0b8b Merge branch 'sprint/max41_mayue_bug#26247' into 'master' 
* Fix bug #26247.

See merge request easycorp/zentaopms!4907
 2022-08-10 21:17:44 +00:00
王怡栋 1d4c64c4c1 Merge branch 'sprint/224_liumengyi_fixbug' into 'master' 
Sprint/224 liumengyi fixbug

See merge request easycorp/zentaopms!4905
 2022-08-10 20:58:24 +00:00
王怡栋 5b8f34ec6a Merge branch 'importExport' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4904
 2022-08-10 19:53:23 +00:00
王怡栋 0ff15d38c0 Merge branch 'sprint/224_tianshujie_bug' into 'master' 
Sprint/224 tianshujie bug

See merge request easycorp/zentaopms!4903
 2022-08-10 09:15:10 +00:00
王怡栋 de30066a3b Merge branch 'master_liuhong_63787' into 'master' 
Master liuhong 63787

See merge request easycorp/zentaopms!4902
 2022-08-10 08:11:31 +00:00
wangyidong 8ca35db2d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-10 15:29:37 +08:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
wangyidong 9413ee0a70 Merge branch 'sprint/master_lanzongjun_fixbug' 2022-08-10 15:21:51 +08:00
王怡栋 af7904f9f1 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug' 
# Conflicts:
#   module/project/view/create.html.php
 2022-08-10 07:19:51 +00:00
wangyidong 36ddb50872 Merge branch 'sprint/devplat_31' 2022-08-10 14:57:25 +08:00
wangyidong f55aec696c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-10 14:54:02 +08:00
wangyidong 6db44273d2 Merge branch 'sprint224_zg_tasks' 2022-08-10 14:51:59 +08:00
王怡栋 48c40b633f Merge branch 'sprint/devplat_31' into 'master' 
* Fix bug #26173.

See merge request easycorp/zentaopms!4891
 2022-08-10 06:02:48 +00:00
王怡栋 338f149887 Merge branch 'sprint/224_liumengyi_25319' into 'master' 
* Fix bug #25319.

See merge request easycorp/zentaopms!4892
 2022-08-10 05:53:44 +00:00
王怡栋 99fa671ce8 Merge branch 'tanghucheng_task' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4889
 2022-08-10 05:52:29 +00:00
王怡栋 87889f1498 Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of edit execution can change closedDate.

See merge request easycorp/zentaopms!4887
 2022-08-10 05:51:01 +00:00
王怡栋 53c42e37c5 Merge branch 'sprint/224_liumengyi_26109' into 'master' 
* Fix bug #26109.

See merge request easycorp/zentaopms!4885
 2022-08-10 05:50:28 +00:00
wangyidong 4f980fd52e Merge branch 'sprint/224_dongli_bug63669' 2022-08-10 13:46:36 +08:00
王怡栋 026739dc18 Merge branch 'master' into 'sprint/224_dongli_bug63669' 
# Conflicts:
#   module/my/css/task.css
 2022-08-10 05:46:12 +00:00
王怡栋 2a2abfe9f0 Merge branch 'sprint/224_tianshujie_bug' into 'master' 
Sprint/224 tianshujie bug

See merge request easycorp/zentaopms!4890
 2022-08-10 05:06:59 +00:00
王怡栋 6045f06f48 Merge branch 'sprint/ZUI_guofeilong_fix_bug_in_c-name' into 'master' 
* Fix css bug in td.c-title

See merge request easycorp/zentaopms!4883
 2022-08-10 03:09:30 +00:00
王怡栋 b690d95d2a Merge branch 'sprint/224_liumengyi_63891' into 'master' 
* Finish task #63891.

See merge request easycorp/zentaopms!4879
 2022-08-10 02:49:44 +00:00
王怡栋 cc2c2b2a54 Merge branch 'master_liuhong_63771' into 'master' 
*Finish task #63771.

See merge request easycorp/zentaopms!4881
 2022-08-10 02:20:29 +00:00
wangyidong 9959006f46 * change upgrade for change engine. 2022-08-10 09:43:40 +08:00
王怡栋 c3376a2116 Merge branch 'master_liuhong_63783' into 'master' 
Master liuhong 63783

See merge request easycorp/zentaopms!4876
 2022-08-10 01:33:40 +00:00
王怡栋 03deac02c8 Merge branch 'master_liuhong_63782' into 'master' 
*Finish task #63782.

See merge request easycorp/zentaopms!4874
 2022-08-10 01:32:29 +00:00
王怡栋 d51846a966 Merge branch 'importExport' into 'master' 
* Code for port.

See merge request easycorp/zentaopms!4875
 2022-08-10 01:32:04 +00:00
王怡栋 896f7d2fb1 Merge branch 'master_liuhong_63775' into 'master' 
*Finish task #63775

See merge request easycorp/zentaopms!4873
 2022-08-10 01:31:10 +00:00
王怡栋 210e4a4d81 Merge branch 'tanghucheng_task' into 'master' 
* Finish task #63793.

See merge request easycorp/zentaopms!4870
 2022-08-10 01:30:32 +00:00
王怡栋 b31a44f1a4 Merge branch 'sprint/224_tianshujie' into 'master' 
Sprint/224 tianshujie

See merge request easycorp/zentaopms!4878
 2022-08-10 01:30:17 +00:00
王怡栋 bedec71945 Merge branch 'master_liuhong_63776' into 'master' 
*Finish task #63776

See merge request easycorp/zentaopms!4872
 2022-08-10 01:29:59 +00:00
王怡栋 ffa4b1f85d Merge branch 'master_xieqiyu_63790' into 'master' 
* Code for task#63790.

See merge request easycorp/zentaopms!4871
 2022-08-10 01:29:35 +00:00
王怡栋 1ef8043796 Merge branch 'sprint/devplat_31' into 'master' 
* Finish task #63896.

See merge request easycorp/zentaopms!4877
 2022-08-10 01:08:40 +00:00
王怡栋 964fe5fe4b Merge branch 'master_liuhong_35865' into 'master' 
Finish task #35865.

See merge request easycorp/zentaopms!4867
 2022-08-09 08:48:24 +00:00
王怡栋 65ed4e9ecb Merge branch 'tanghucheng_task' into 'master' 
* Finish task #63794.

See merge request easycorp/zentaopms!4863
 2022-08-09 08:27:21 +00:00
王怡栋 0d2912cb84 Merge branch 'sgm_filepriv' into 'master' 
* Finish task #64212.

See merge request easycorp/zentaopms!4865
 2022-08-09 07:22:42 +00:00
王怡栋 4dd5bb212a Merge branch 'master_liuhong_63780' into 'master' 
Master liuhong 63780

See merge request easycorp/zentaopms!4860
 2022-08-09 06:53:21 +00:00
王怡栋 2dec053c27 Merge branch 'sprint/221_dongli_bug63666' into 'master' 
* Fix bug #63666.

See merge request easycorp/zentaopms!4861
 2022-08-09 06:50:20 +00:00
王怡栋 8b4a96dc13 Merge branch 'master_liuhong_63778' into 'master' 
Master liuhong 63778

See merge request easycorp/zentaopms!4859
 2022-08-09 05:35:05 +00:00
王怡栋 1ed1ec0ab8 Merge branch 'master_liuhong_63781' into 'master' 
Master liuhong 63781

See merge request easycorp/zentaopms!4858
 2022-08-09 05:34:39 +00:00