 孙广明
|
7c2a65393c
|
Merge branch 'zhouxin_feedback_2176' into 'master'
* Resolve feedback #2176.
See merge request easycorp/zentaopms!6917
|
2023-02-10 07:21:22 +00:00 |
|
|
zhouxin
|
c725109f45
|
* Resolve feedback #2176.
|
2023-02-10 15:16:13 +08: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 |
|
|
hufangzhou
|
17bbda6505
|
* Format the code.
|
2023-02-10 06:09:44 +00:00 |
|
|
liumengyi
|
6f39d4f87c
|
* Add sql.
|
2023-02-10 13:58:22 +08:00 |
|
|
hufangzhou
|
35bd85a243
|
* Modifying the access control of the parent phase does not synchronize the child phase's.
|
2023-02-10 05:41:06 +00:00 |
|
|
孙广明
|
51135f13f5
|
Merge branch 'zenops_61' into 'master'
* Fix error for php5.3.
See merge request easycorp/zentaopms!6909
|
2023-02-10 05:27:52 +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 |
|
|
guofeilong
|
ef34cdf402
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_fix_style_in_flowChart
|
2023-02-10 11:25:01 +08:00 |
|
|
guofeilong
|
08b3159b3d
|
* Code for fix style problem in flowChart.
|
2023-02-10 11:24:53 +08:00 |
|
|
wangyidong
|
de07d90b19
|
* fix bug #32016.
|
2023-02-10 11:22:34 +08:00 |
|
|
wangyuting2
|
e7a66de47f
|
* Fix admin model menu bug.
|
2023-02-10 10:31:32 +08:00 |
|
|
zhaoke
|
6e86ba1ecf
|
* Update action label.
|
2023-02-10 02:18:35 +00:00 |
|
|
孙广明
|
c824a0a053
|
Merge branch 'fix_devops_bug' into 'master'
Fix devops bug
See merge request easycorp/zentaopms!6910
|
2023-02-10 01:46:38 +00:00 |
|
|
zhaoke
|
591fd06346
|
* Fix array_column not support object array.
|
2023-02-10 01:14:03 +00:00 |
|
|
liuyongkai
|
08e12a8374
|
* Add annotation.
|
2023-02-10 09:09:11 +08:00 |
|
|
zhaoke
|
acc714a033
|
* Fix error for php5.3.
|
2023-02-10 00:49:15 +00:00 |
|
|
zhaoke
|
55c9922a49
|
* Fix error for php5.3.
|
2023-02-09 09:14:17 +00:00 |
|
|
孙广明
|
d29ddaed77
|
Merge branch 'zenops_61' into 'master'
* Fix error for php5.3.
See merge request easycorp/zentaopms!6907
|
2023-02-09 08:07:23 +00:00 |
|
|
zhaoke
|
db114d1c39
|
* Fix error for php5.3.
|
2023-02-09 08:02:50 +00:00 |
|
|
孙广明
|
8977945f6b
|
Merge branch 'fixbug_liumengyi_31978' into 'master'
* Fix bug #31978.
See merge request easycorp/zentaopms!6895
|
2023-02-09 07:05:10 +00:00 |
|
|
孙广明
|
f1b0412a19
|
Merge branch 'fixbug_liumengyi_31992' into 'master'
* Fix bug #31992.
See merge request easycorp/zentaopms!6902
|
2023-02-09 07:05:01 +00:00 |
|
|
liumengyi
|
504b9d8a4d
|
* Fix bug #31998.
|
2023-02-09 15:00:37 +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 |
|
|
wangyuting2
|
e4c3846cca
|
* Fix bug #30351.
|
2023-02-09 14:47:26 +08: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 |
|
|
daitingting
|
e155d462a7
|
* Fix bug #24499.
|
2023-02-09 06:10:28 +00:00 |
|
|
liumengyi
|
54748bc377
|
* Fix bug #31992.
|
2023-02-09 13:59:02 +08:00 |
|
|
hufangzhou
|
8d26dceb4b
|
* Compatible with php5.3.
|
2023-02-09 05:54:15 +00:00 |
|
|
liuyongkai
|
a4fdf693cd
|
* Fix some bugs.
|
2023-02-09 13:37:58 +08: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 |
|
|
caoyanyi
|
cb96d6b017
|
* Modify array defined.
|
2023-02-09 12:07:35 +08:00 |
|
|
wangyuting2
|
01b2b381b2
|
* Fix bug #28865.
|
2023-02-09 11:20:25 +08:00 |
|
|
胡方舟
|
234f954717
|
Merge branch 'bugfix/liwenrui/explode' into 'master'
* fix explode usages for php 5.3.
See merge request easycorp/zentaopms!6897
|
2023-02-09 03:11:33 +00:00 |
|
|
Wenrui LI
|
618b682169
|
* fix explode usages for php 5.3.
|
2023-02-09 11:10:04 +08: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 |
|
|
tianshujie
|
88d990875b
|
* Fix bug #23550.
|
2023-02-09 10:50:40 +08:00 |
|
|
liumengyi
|
39ed4349e0
|
* Fix bug #31978.
|
2023-02-09 10:42:47 +08:00 |
|
|
daitingting
|
1a8d5a70e7
|
* Fix bug #30843.
|
2023-02-09 01:35:19 +00:00 |
|
|
guofeilong
|
bf16c348ef
|
* zui: Code for update theme css.
|
2023-02-09 08:43:03 +08: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 |
|