 guofeilong
|
760168cc50
|
* Code for admin.css refactors.
|
2023-02-09 10:10:22 +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 |
|
|
caoyanyi
|
08640c3f68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 09:09:55 +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 |
|
|
王怡栋
|
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 |
|
|
wangyidong
|
43f31bbe44
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-08 16:27:17 +08: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 |
|
|
wangyidong
|
bc833a572e
|
* adjust for task #83746.
|
2023-02-08 16:06:45 +08:00 |
|
|
王怡栋
|
1c940b6262
|
Merge branch 'sprint/285_getDate' into 'sprint/285'
Sprint/285 get date
See merge request easycorp/zentaopms!6887
|
2023-02-08 08:05:05 +00:00 |
|
|
wangyuting2
|
afaa89f8fd
|
* Fix bug #27242.
|
2023-02-08 16:03:35 +08:00 |
|
|
caoyanyi
|
88ad600143
|
* Adjust code.
|
2023-02-08 15:53:04 +08:00 |
|
|
Yagami
|
c2724b9f57
|
Merge branch 'zentaopms_281'
|
2023-02-08 15:31:13 +08:00 |
|
|
caoyanyi
|
2e023d5dc1
|
* Adjust code.
|
2023-02-08 15:30:36 +08:00 |
|
|
caoyanyi
|
43866fe1c9
|
* Adjust code.
|
2023-02-08 15:29:53 +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 |
|
|
guofeilong
|
093a84f9ee
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_getDate
|
2023-02-08 15:07:05 +08:00 |
|
|
liuhong
|
ffd0c2ce7f
|
* Adjust for ticket 326.
|
2023-02-08 06:58:27 +00:00 |
|
|
guofeilong
|
ffb6b0a0c3
|
* Code for genDateUsed
|
2023-02-08 14:57:43 +08:00 |
|
|
王怡栋
|
1a671984ef
|
Merge branch 'sprint/cyy_83742' into 'sprint/285'
Sprint/cyy 83742
See merge request easycorp/zentaopms!6881
|
2023-02-08 06:53:30 +00:00 |
|
|
王怡栋
|
ea9ac74ab3
|
Merge branch 'sprint/285_tsj_83723' into 'sprint/285'
Sprint/285 tsj 83723
See merge request easycorp/zentaopms!6885
|
2023-02-08 06:52:12 +00:00 |
|
|
tianshujie
|
aeea82dae9
|
* Code for finish task #83724.
|
2023-02-08 14:46:13 +08:00 |
|
|
caoyanyi
|
3c2e056d46
|
* Adjust code.
|
2023-02-08 14:45:22 +08:00 |
|
|
caoyanyi
|
ff1f245a45
|
Merge branch 'sprint/cyy_83742' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_83742
|
2023-02-08 14:35:23 +08:00 |
|
|
caoyanyi
|
32623d2560
|
* Optimize admin page style.
|
2023-02-08 14:34:57 +08:00 |
|
|
tianshujie
|
d5cfe17980
|
* Code for finish task #83743.
|
2023-02-08 14:11:23 +08:00 |
|
|
zenggang
|
8a645d03ae
|
* Fix bug#31963
|
2023-02-08 05:55:45 +00:00 |
|
|
tanghucheng
|
3e70f86ca2
|
* Fix bug for import testcase.
|
2023-02-08 13:55:25 +08:00 |
|
|
liuhong
|
e16cf8278c
|
* Resolved feedback #1855
|
2023-02-08 05:26:58 +00:00 |
|
|
caoyanyi
|
c97774f8a0
|
* Optimize admin page style.
|
2023-02-08 13:26:16 +08:00 |
|
|
hufangzhou
|
1546a7da88
|
* Complete changelog.
|
2023-02-08 13:16:39 +08:00 |
|
|
caoyanyi
|
adfc82feef
|
* Optimize holiday import style.
|
2023-02-08 13:10:07 +08:00 |
|
|
caoyanyi
|
03ed75a2d3
|
* Code for task #83742.
|
2023-02-08 12:44:50 +08:00 |
|
|
孙广明
|
99446cf8d3
|
Merge branch 'zhouxin_feedback_313' into 'master'
* Resolve feedback #313.
See merge request easycorp/zentaopms!6861
|
2023-02-08 03:23:03 +00:00 |
|
|
王怡栋
|
98c99cf572
|
Merge branch 'dev/gfl_task_#88327_refactors' into 'sprint/285'
Dev/gfl task #88327 refactors
See merge request easycorp/zentaopms!6880
|
2023-02-08 03:13:27 +00:00 |
|
|
tianshujie
|
dddee69dc6
|
* Code for finish task #83725.
|
2023-02-08 11:12:49 +08:00 |
|
|
tianshujie
|
987e5c6fa9
|
* Code for finish task #83736.
|
2023-02-08 11:11:03 +08:00 |
|
|
zhaoke
|
37ae4b9af5
|
* Add show/hide password.
|
2023-02-08 03:07:09 +00:00 |
|