Commit Graph
50793 Commits
Author SHA1 Message Date
zhaoke eee007f88f * Fix delete node fail. 2023-02-15 17:43:14 +08:00
zhaoke 807971cb91 * Renmove console. 2023-02-15 00:33:15 +00:00
zhaoke a2c3fee694 * Fix bug #32141. 2023-02-14 10:33:32 +00:00
zhaoke 9c920b1547 * Fix bug #32108. 2023-02-14 05:22:37 +00:00
zhaoke 880318bc1b * Move automation btn. 2023-02-13 07:50:50 +00:00
zhaoke 8391cf5679 * Fix bug 31967. 2023-02-13 07:33:10 +00:00
zhaoke 3acbbc90db * Fix bug #31967. 2023-02-13 07:32:55 +00:00
zhaoke 69159b5520 * Fix bug #32037. 2023-02-10 07:30:45 +00:00
zhaoke 6e86ba1ecf * Update action label. 2023-02-10 02:18:35 +00:00
zhaoke 591fd06346 * Fix array_column not support object array. 2023-02-10 01:14:03 +00: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
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
王怡栋 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
王怡栋 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
liuhong 534b5e6471 * Adjust code for ticket #326 2023-02-08 08:25:27 +00:00
wangyuting2 ab16894c06 * Optimize page css. 2023-02-08 16:17:16 +08:00
xieqiyu e00862dd0c * Code for bug#29159. 2023-02-08 16:16:33 +08:00
wangyuting2 afaa89f8fd * Fix bug #27242. 2023-02-08 16:03:35 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
孙广明 5611c2c285 Merge branch 'zenops_61' into 'master'
* Add show/hide password.

See merge request easycorp/zentaopms!6888
2023-02-08 07:14:32 +00:00