 tianshujie
|
9506850831
|
* Modify the parameters of the database navigation link.
|
2023-02-09 14:50:18 +08:00 |
|
|
tianshujie
|
173b9ad1d2
|
* Modify the style of the secondary development page.
|
2023-02-09 14:43:06 +08:00 |
|
|
caoyanyi
|
3cbc28df28
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 14:21:55 +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 |
|
|
王怡栋
|
9be9451a12
|
Merge branch 'sprint/285_tsj' into 'sprint/285'
Sprint/285 tsj
See merge request easycorp/zentaopms!6898
|
2023-02-09 05:09:06 +00:00 |
|
|
caoyanyi
|
cb96d6b017
|
* Modify array defined.
|
2023-02-09 12:07:35 +08:00 |
|
|
tianshujie
|
bd95b1eb84
|
* Code for finish task #83733.
|
2023-02-09 11:54:01 +08:00 |
|
|
wangyuting2
|
01b2b381b2
|
* Fix bug #28865.
|
2023-02-09 11:20:25 +08:00 |
|
|
tianshujie
|
789a39a52c
|
* Example Modify the js jump logic.
|
2023-02-09 11:14:13 +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 |
|
|
tianshujie
|
0e9b56e492
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:57:42 +08:00 |
|
|
tianshujie
|
cdcfb74022
|
Merge branch 'sprint/285_tsj' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:57:22 +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 |
|
|
王怡栋
|
6f48c9f367
|
Merge branch 'sprint/cyy_83742' into 'sprint/285'
* Optimize page style.
See merge request easycorp/zentaopms!6893
|
2023-02-09 02:56:30 +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
|
081c55f5ab
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:54:28 +08:00 |
|
|
tianshujie
|
788a534762
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:54:11 +08:00 |
|
|
tianshujie
|
88d990875b
|
* Fix bug #23550.
|
2023-02-09 10:50:40 +08:00 |
|
|
guofeilong
|
4d5ab22aa5
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:40:35 +08:00 |
|
|
guofeilong
|
cbbe375ebb
|
* admin: css refacotrs.
|
2023-02-09 10:37:31 +08:00 |
|
|
caoyanyi
|
7e20b4813f
|
* Modify sub menu active.
|
2023-02-09 10:38:05 +08:00 |
|
|
guofeilong
|
25e012a1d4
|
* Code for adjust .side.penl's height
|
2023-02-09 10:27:07 +08:00 |
|
|
guofeilong
|
9b78e862b2
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:12:46 +08:00 |
|
|
guofeilong
|
34504c80d7
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 10:10:27 +08:00 |
|
|
guofeilong
|
760168cc50
|
* Code for admin.css refactors.
|
2023-02-09 10:10:22 +08:00 |
|
|
wangyidong
|
4ddfbece68
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 10:01:04 +08:00 |
|
|
tianshujie
|
bc73b6d379
|
* Code for finish task #83727.
|
2023-02-09 09:59:56 +08:00 |
|
|
wangyidong
|
81e8a96d6f
|
* code for task #83740.
|
2023-02-09 09:59:24 +08:00 |
|
|
daitingting
|
1a8d5a70e7
|
* Fix bug #30843.
|
2023-02-09 01:35:19 +00:00 |
|
|
tianshujie
|
e5d74210b5
|
* Delete useless language items.
|
2023-02-09 09:31:35 +08:00 |
|
|
tianshujie
|
f53cd0d57a
|
* Code for finish task #83726.
|
2023-02-09 09:29:06 +08:00 |
|
|
guofeilong
|
5a1d980419
|
gMerge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 09:28:45 +08:00 |
|
|
guofeilong
|
4a969c82fc
|
* Code for admin.css refactors .
|
2023-02-09 09:28:39 +08:00 |
|
|
tianshujie
|
9769b60fe7
|
* The open,biz version removes the document template block.
|
2023-02-09 09:25:39 +08:00 |
|
|
tianshujie
|
99e4b6eac6
|
* Add head of product,execution,kanban pager.
|
2023-02-09 09:12:18 +08:00 |
|
|
caoyanyi
|
08640c3f68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 09:09:55 +08:00 |
|
|
tianshujie
|
a3a4c21ed9
|
* Delete useless language items.
|
2023-02-09 08:49:11 +08:00 |
|
|
guofeilong
|
bf16c348ef
|
* zui: Code for update theme css.
|
2023-02-09 08:43:03 +08:00 |
|
|
tianshujie
|
a7837f6ea2
|
* Code for finish task #83728.
|
2023-02-08 17:20:39 +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
|
b3c22aeaa1
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-08 17:01:22 +08:00 |
|
|
wangyidong
|
7169cd0397
|
* adjust for video image.
|
2023-02-08 17:00:04 +08:00 |
|
|
caoyanyi
|
c365db5074
|
* Code for task #83735.
|
2023-02-08 16:50:47 +08:00 |
|
|
wangyidong
|
a12f2b07b4
|
* revert for api link.
|
2023-02-08 16:44:13 +08: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 |
|