Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
51,697 Commits 2 Branches 292 Tags
260c4c0528736ff75fd63f1a5f2b562ff55f1d92
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangyidong 71f0edcb20 * add new priv for custom-hours. 2023-02-27 16:20:06 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
王怡栋 ef2b5b2461 Merge branch 'dev/gfl_85502' into 'master' 
Dev/gfl 85502

See merge request easycorp/zentaopms!7080
 2023-02-27 07:26:37 +00:00
王怡栋 8b56c39297 Merge branch 'sprint/hufangzhou_package' into 'master' 
Sprint/hufangzhou package

See merge request easycorp/zentaopms!7077
 2023-02-27 06:58:39 +00:00
王怡栋 dbdcdf93b4 Merge branch 'sprint/tsj_tip' into 'master' 
* Modify method tip of stage create page.

See merge request easycorp/zentaopms!7075
 2023-02-27 06:29:11 +00:00
王怡栋 b5099018dc Merge branch 'cyy_repo' into 'master' 
* Remove unused code.

See merge request easycorp/zentaopms!7073
 2023-02-27 05:42:59 +00:00
王怡栋 b227ebdfcf Merge branch 'dev/gfl_theme_css_refactors' into 'master' 
* ZUI: css theme refactors .

See merge request easycorp/zentaopms!7065
 2023-02-24 05:41:54 +00:00
王怡栋 9e73c11871 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix bug #27133.

See merge request easycorp/zentaopms!7060
 2023-02-24 00:52:49 +00:00
王怡栋 84624b757f Merge branch 'tsj_fixbug' into 'master' 
* Fix bug #32208.

See merge request easycorp/zentaopms!7057
 2023-02-23 08:45:54 +00:00
王怡栋 65991d0a05 Merge branch 'dev/gfl_admin_css_refactors' into 'master' 
* Code for css refactors in admin.

See merge request easycorp/zentaopms!7053
 2023-02-23 07:19:31 +00:00
王怡栋 4ad622823f Merge branch 'cyy_dropdown' into 'master' 
* Modify closed block style for execution drop down menu.

See merge request easycorp/zentaopms!7050
 2023-02-23 07:19:18 +00:00
wangyidong 35083408c9 * remove useless code. 2023-02-23 09:18:49 +08:00
王怡栋 3c62d387a3 Merge branch 'dev/gfl_admin_view_refactors' into 'master' 
* Code for admin view refactors.

See merge request easycorp/zentaopms!7041
 2023-02-22 09:18:07 +00:00
王怡栋 15f781ccdb Merge branch 'tsj_fixbug' into 'master' 
* Modify menu param.

See merge request easycorp/zentaopms!7036
 2023-02-22 08:15:04 +00:00
王怡栋 4363ce8031 Merge branch 'ticket_398' into 'master' 
* Adjust code for feedback #2274.

See merge request easycorp/zentaopms!7034
 2023-02-22 08:14:40 +00:00
王怡栋 73ac71d948 Merge branch 'sprint/tsj_issue' into 'master' 
Sprint/tsj issue

See merge request easycorp/zentaopms!7031
 2023-02-22 07:52:35 +00:00
王怡栋 8b53329ebb Merge branch 'cyy_optimize' into 'master' 
* Code for issue #762.

See merge request easycorp/zentaopms!7030
 2023-02-22 07:51:35 +00:00
王怡栋 c2c7469dde Merge branch 'dev/gfl_admin_view_refactors' into 'master' 
* admin: view refactors.

See merge request easycorp/zentaopms!7032
 2023-02-22 07:50:33 +00:00
王怡栋 faf214c602 Merge branch 'lyk_bug_32376' into 'master' 
* Fix bug #32376.

See merge request easycorp/zentaopms!7029
 2023-02-22 05:29:49 +00:00
王怡栋 9ca6097dc6 Merge branch 'tsj_fixbug' into 'master' 
* Code for finish task #85046.

See merge request easycorp/zentaopms!7027
 2023-02-22 03:16:05 +00:00
王怡栋 d40df85905 Merge branch 'bugfix/konglignmao-f2188' into 'master' 
* Resove feedback f2188, change privilege by modulue error.

See merge request easycorp/zentaopms!7025
 2023-02-22 02:54:21 +00:00
王怡栋 1303aabfdc Merge branch 'bugfix/myWorkApi' into 'master' 
+ Resolved feedback #2016, the api my work task response error.

See merge request easycorp/zentaopms!6778
 2023-02-22 02:53:14 +00:00
王怡栋 9565f88595 Merge branch 'tsj_fixbug' into 'master' 
* Increment to the value of null time.

See merge request easycorp/zentaopms!7018
 2023-02-22 01:37:58 +00:00
王怡栋 d37613d077 Merge branch 'sprint/hufangzhou_fixbug' into 'master' 
* Recovery code.

See merge request easycorp/zentaopms!7021
 2023-02-22 01:36:19 +00:00
王怡栋 8c7788aa03 Merge branch 'dev/gfl_admin_refactors' into 'master' 
Dev/gfl admin refactors

See merge request easycorp/zentaopms!7016
 2023-02-21 08:42:47 +00:00
wangyidong 36150659f7 * adjst code. 2023-02-21 09:35:47 +08:00
王怡栋 f22e5681af Merge branch 'cyy_bug' into 'master' 
* Modify date diff result.

See merge request easycorp/zentaopms!7006
 2023-02-21 01:06:04 +00:00
王怡栋 1af0838d38 Merge branch 'sprint/hufangzhou_bug' into 'master' 
* Fix bug for project-execution feature bar active.

See merge request easycorp/zentaopms!7005
 2023-02-21 00:57:40 +00:00
王怡栋 df38f27ead Merge branch 'dev/gfl_theme.css_refactors' into 'master' 
Dev/gfl theme.css refactors

See merge request easycorp/zentaopms!7004
 2023-02-20 08:54:59 +00:00
王怡栋 27bebb66a8 Merge branch 'ticket_389' into 'master' 
* Resolved feedback 2099

See merge request easycorp/zentaopms!6998
 2023-02-20 07:25:51 +00:00
王怡栋 f53ae41d59 Merge branch 'dev/gfl_add_icon_agileplus_and_waterfallplus' into 'master' 
* ZUI: add icon agileplus and waterfallplus.

See merge request easycorp/zentaopms!6997
 2023-02-20 02:33:35 +00:00
wangyidong 1a29a5abb9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-20 09:19:33 +08:00
wangyidong cca77bda34 Merge branch 'sprint/tsj_task' 2023-02-20 09:19:21 +08:00
王怡栋 c004967af9 Merge branch 'sprint/290_liumengyi_32244' into 'master' 
* Fix bug #32244, #32245, #32249, #32251,  #32255, #32179, @32167.

See merge request easycorp/zentaopms!6989
 2023-02-20 01:16:52 +00:00
王怡栋 bc4efa791c Merge branch 'sprint/290_liumengyi_84586' into 'master' 
* Finish task #84586.

See merge request easycorp/zentaopms!6987
 2023-02-20 01:15:52 +00:00
王怡栋 5d7f729008 Merge branch 'sprint/290_liumengyi_fixbug' into 'master' 
* Fix bug #32243.

See merge request easycorp/zentaopms!6986
 2023-02-20 01:15:22 +00:00
wangyidong 9f0f6014d8 * fix bug #32109. 2023-02-17 15:17:06 +08:00
王怡栋 60df9f7ee6 Merge branch 'zentaopms_wangyuting' into 'master' 
* Optimize processFile4Object.

See merge request easycorp/zentaopms!6985
 2023-02-17 06:18:52 +00:00
王怡栋 99c3514e5a Merge branch 'sprint/tsj_compatibility' into 'master' 
Sprint/tsj compatibility

See merge request easycorp/zentaopms!6984
 2023-02-17 06:17:08 +00:00
wangyidong 2b75166e7c * fix bug #32030. 2023-02-17 14:12:04 +08:00
wangyidong 28537381dd * fix bug #32172. 2023-02-17 13:22:32 +08:00
wangyidong e3a75c6b80 * fix bug #32246. 2023-02-17 11:48:30 +08:00
王怡栋 629bd1357a Merge branch 'sprint/285' into 'master' 
Sprint/285

See merge request easycorp/zentaopms!6983
 2023-02-17 02:47:29 +00:00
王怡栋 53cbb81aaa Merge branch 'sprint/290_liumengyi_fixbug' into 'master' 
* Fix bug of create waterfallplus's execution.

See merge request easycorp/zentaopms!6981
 2023-02-17 02:01:40 +00:00
王怡栋 361568a575 Merge branch 'sprint/tsj_fixbug' into 'master' 
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6980
 2023-02-17 02:00:33 +00:00
王怡栋 4be9a95e11 Merge branch 'sprint/285' into 'master' 
Sprint/285

See merge request easycorp/zentaopms!6982
 2023-02-17 02:00:05 +00:00
wangyidong 427406aa36 Merge branch 'sprint/285' 2023-02-17 09:26:51 +08:00
wangyidong 7bc1b0da56 * fix bug #32203. 2023-02-17 09:25:07 +08:00
wangyidong 72b51603f4 * fix bug #32214. 2023-02-17 09:25:07 +08:00
王怡栋 761a7ee0a2 Merge branch 'zentaopms_max4.2_wangyuting' into 'master' 
* Fix bug #27133.

See merge request easycorp/zentaopms!6971
 2023-02-16 06:44:20 +00:00
王怡栋 0e107103c9 Update helper.class.php 2023-02-16 06:44:03 +00:00
王怡栋 b14b1806be Merge branch 'zentaopms_biz8.2_wangyuting' into 'master' 
* Fix bug #26855.

See merge request easycorp/zentaopms!6972
 2023-02-16 06:26:54 +00:00
王怡栋 4f64ce13d7 Merge branch 'master_xieqiyu_26434' into 'master' 
* Code for bug#26434.

See merge request easycorp/zentaopms!6973
 2023-02-16 06:25:22 +00:00
王怡栋 96f6bff0bd Merge branch 'master_xieqiyu_28673' into 'master' 
* Code for bug#28673.

See merge request easycorp/zentaopms!6974
 2023-02-16 06:24:56 +00:00
王怡栋 64acd2dced Merge branch 'master_xieqiyu_25082' into 'master' 
* Code for bug#25082.

See merge request easycorp/zentaopms!6976
 2023-02-16 06:24:38 +00:00
王怡栋 3b777eeb4e Merge branch 'sprint/feedback2203' into 'master' 
* Fix feedback feedback2204.

See merge request easycorp/zentaopms!6970
 2023-02-16 05:08:28 +00:00
王怡栋 3a6bca8dc2 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix project extend priv bug.

See merge request easycorp/zentaopms!6966
 2023-02-15 09:22:38 +00:00
王怡栋 9393ee5558 Merge branch 'ticket_bug_366' into 'master' 
* Resolved feedback 2191.

See merge request easycorp/zentaopms!6963
 2023-02-15 07:26:56 +00:00
王怡栋 051a5b4bd9 Merge branch 'master_xieqiyu_32169' into 'master' 
* Code for bug#32169.

See merge request easycorp/zentaopms!6962
 2023-02-15 07:26:24 +00:00
王怡栋 1d8546b946 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* Adjust edit story plan css

See merge request easycorp/zentaopms!6961
 2023-02-15 06:10:41 +00:00
王怡栋 255472632b Merge branch 'mayue_fix_bug#32147' into 'master' 
* Fix bug #32147.

See merge request easycorp/zentaopms!6959
 2023-02-15 05:03:23 +00:00
王怡栋 7fd253551a Merge branch 'sprint/tsj_fixbug' into 'sprint/285' 
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6956
 2023-02-15 03:23:57 +00:00
王怡栋 3c9f973aef Merge branch 'tsj_fixbug' into 'master' 
* Fix bug #32145.

See merge request easycorp/zentaopms!6955
 2023-02-15 03:23:18 +00:00
王怡栋 1f87384b9b Merge branch 'cyy_repo_bug' into 'master' 
* Modify commit link object error.

See merge request easycorp/zentaopms!6952
 2023-02-15 01:13:05 +00:00
王怡栋 e7991dcc5f Merge branch 'ticket_369' into 'master' 
* Adjust code for feedback #2187.

See merge request easycorp/zentaopms!6946
 2023-02-14 08:09:40 +00:00
王怡栋 39388b32f7 Merge branch 'sprint/hufangzhou_fixlang' into 'master' 
* Adjust the lang.

See merge request easycorp/zentaopms!6948
 2023-02-14 08:03:56 +00:00
王怡栋 2c1a4b6113 Merge branch 'sprint/hufangzhou_bug_32104' into 'master' 
* Fix bug #32104.

See merge request easycorp/zentaopms!6947
 2023-02-14 08:03:39 +00:00
wangyidong f90041ca48 * code for task #83736. 2023-02-14 15:55:20 +08:00
王怡栋 48a2dc05bb Merge branch 'dev/gfl_bug#32126' into 'master' 
* Code for bug #32126.

See merge request easycorp/zentaopms!6949
 2023-02-14 07:52:05 +00:00
王怡栋 20f17196b2 Merge branch 'ticket_366' into 'master' 
Ticket 366

See merge request easycorp/zentaopms!6941
 2023-02-14 05:04:09 +00:00
王怡栋 5c28eb1317 Merge branch 'daitingting_bug_#31996' into 'master' 
* Fix bug #31996.

See merge request easycorp/zentaopms!6940
 2023-02-14 05:03:43 +00:00
王怡栋 c31e104d8a Merge branch 'bug_32099' into 'master' 
* Fix bug#32099

See merge request easycorp/zentaopms!6939
 2023-02-14 05:03:13 +00:00
王怡栋 a9cd5ed97b Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master' 
* code for delete / after background-image: url

See merge request easycorp/zentaopms!6938
 2023-02-14 02:00:13 +00:00
王怡栋 50f2598c54 Merge branch 'master_xieqiyu_32089' into 'master' 
* Code for bug#32089.

See merge request easycorp/zentaopms!6934
 2023-02-13 09:24:17 +00:00
王怡栋 665081924d Merge branch 'sprint/hufangzhou_bug_32073' into 'master' 
* Fix bug #32073.

See merge request easycorp/zentaopms!6933
 2023-02-13 09:24:03 +00:00
王怡栋 67591cc509 Merge branch 'master_xieqiyu_26428' into 'master' 
* Code for bug#26428.

See merge request easycorp/zentaopms!6932
 2023-02-13 09:23:43 +00:00
王怡栋 a18abcc5c8 Merge branch 'ticket_336' into 'master' 
Ticket 336

See merge request easycorp/zentaopms!6931
 2023-02-13 09:23:10 +00:00
王怡栋 9b95d6e487 Merge branch 'sprint/hufangzhou_bug_32075' into 'master' 
* Fix bug #32075.

See merge request easycorp/zentaopms!6930
 2023-02-13 09:22:40 +00:00
wangyidong 26f1849bbc * code for task #83739. 2023-02-13 16:52:02 +08:00
王怡栋 ae947ff614 Merge branch 'sprint/hufangzhou_modifysql' into 'master' 
* Move the sql to update18.0.beta3.sql.

See merge request easycorp/zentaopms!6929
 2023-02-13 07:28:44 +00:00
王怡栋 b940529b36 Merge branch 'master_xieqiyu_31983' into 'master' 
* Code for bug#31983.

See merge request easycorp/zentaopms!6926
 2023-02-13 07:28:21 +00:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
王怡栋 6aec4913b8 Merge branch 'fixbug_liumengyi_32064' into 'master' 
* Fix bug #32064.

See merge request easycorp/zentaopms!6925
 2023-02-13 07:04:28 +00:00
王怡栋 b7ff5493ea Merge branch 'cyy_repo_bug' into 'master' 
* Modify error for mr relation.

See merge request easycorp/zentaopms!6928
 2023-02-13 07:01:24 +00:00
王怡栋 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
wangyidong ff66b39a2a * code for task #83736. 2023-02-10 17:37:50 +08: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
王怡栋 ad7430857e Merge branch 'sprint/cyy_bug' into 'sprint/285' 
Sprint/cyy bug

See merge request easycorp/zentaopms!6913
 2023-02-10 03:31:25 +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
王怡栋 6c06df5f1e Merge branch 'sprint/285_navigation' into 'sprint/285' 
Sprint/285 navigation

See merge request easycorp/zentaopms!6911
 2023-02-10 03:30:23 +00:00
王怡栋 901a64e246 Merge branch 'sprint/285_tsj_issue' into 'sprint/285' 
* Resolve issue #744.

See merge request easycorp/zentaopms!6908
 2023-02-10 03:29:34 +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