 guofeilong
|
4fe1effdec
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-06 08:27:25 +08:00 |
|
|
guofeilong
|
f1124e5cde
|
* Code for bug #31938
|
2023-02-06 08:27:17 +08:00 |
|
|
caoyanyi
|
e539996403
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-06 08:23:10 +08:00 |
|
|
wangyidong
|
9b2050098d
|
* fix bug #29748.
|
2023-02-03 17:17:39 +08:00 |
|
|
王怡栋
|
9d34521ef7
|
Merge branch 'master_xieqiyu_28270' into 'master'
* Code for bug#28270.
See merge request easycorp/zentaopms!6858
|
2023-02-03 09:14:46 +00:00 |
|
|
王怡栋
|
ca09570077
|
Merge branch 'dev/gfl_my_preference_css_refactors' into 'master'
* Code for css in preference.html.php .
See merge request easycorp/zentaopms!6857
|
2023-02-03 09:14:09 +00:00 |
|
|
xieqiyu
|
2ab3b9f8cb
|
* Code for bug#28270.
|
2023-02-03 16:59:43 +08:00 |
|
|
guofeilong
|
f71582f9f2
|
* Code for bug #31907
|
2023-02-03 16:49:29 +08:00 |
|
|
guofeilong
|
ec8e0acb79
|
* Code for css in admin.html
|
2023-02-03 16:37:16 +08:00 |
|
|
guofeilong
|
b5df472639
|
* Code for css in preference.html.php .
|
2023-02-03 16:27:52 +08:00 |
|
|
王怡栋
|
b1bd43c331
|
Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug...
See merge request easycorp/zentaopms!6852
|
2023-02-03 07:59:06 +00:00 |
|
|
liuhong
|
3d24c6980f
|
* Adjust code for 30389.
|
2023-02-03 07:33:01 +00:00 |
|
|
guofeilong
|
1538371339
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 15:13:00 +08:00 |
|
|
王怡栋
|
3ec34c9acd
|
Merge branch 'master_xieqiyu_28704' into 'master'
* Code for bug#28704.
See merge request easycorp/zentaopms!6856
|
2023-02-03 06:46:28 +00:00 |
|
|
王怡栋
|
bc3ba1e05c
|
Merge branch 'zentaopms284_bug#25538' into 'master'
* Fix bug #25538.
See merge request easycorp/zentaopms!6854
|
2023-02-03 06:39:06 +00:00 |
|
|
王怡栋
|
f6264aed8c
|
Merge branch 'ticket_324' into 'master'
* Adjuct for ticket 324.
See merge request easycorp/zentaopms!6853
|
2023-02-03 06:36:09 +00:00 |
|
|
xieqiyu
|
3c8d8e27a6
|
* Code for bug#28704.
|
2023-02-03 14:34:16 +08:00 |
|
|
guofeilong
|
54f3ba6ec1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 14:28:38 +08:00 |
|
|
王怡栋
|
c1ea319bcd
|
Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* Code for style problem in flowchart
See merge request easycorp/zentaopms!6855
|
2023-02-03 06:28:02 +00:00 |
|
|
guofeilong
|
df8608ddc9
|
* Code for style problem in flowchart
|
2023-02-03 14:23:22 +08:00 |
|
|
wangyuting2
|
f77ad21c48
|
* Fix bug #25538.
|
2023-02-03 13:59:59 +08:00 |
|
|
wangyidong
|
d4f96da08f
|
* code for story 41755.
|
2023-02-03 13:57:36 +08:00 |
|
|
Yagami
|
cf5c7a2fbc
|
* Code for project required field.
|
2023-02-03 13:17:12 +08:00 |
|
|
caoyanyi
|
af95070453
|
* Add desc tips.
|
2023-02-03 12:29:26 +08:00 |
|
|
caoyanyi
|
a23689699a
|
* Adjust code.
|
2023-02-03 12:22:57 +08:00 |
|
|
朱金勇
|
88f2d3ef49
|
Merge branch 'fix/git' into 'master'
* Fix missing Gogs,Gitea.
See merge request easycorp/zentaopms!6845
|
2023-02-03 04:14:22 +00:00 |
|
|
caoyanyi
|
4896324869
|
* Optimize plugin desc style.
|
2023-02-03 12:08:57 +08:00 |
|
|
liuhong
|
9c248696e8
|
* Adjuct for ticket 324.
|
2023-02-03 03:33:58 +00:00 |
|
|
caoyanyi
|
9e3ba4bcb7
|
* Fix bug #31893.
|
2023-02-03 11:27:50 +08:00 |
|
|
caoyanyi
|
5ce773d09b
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 11:08:04 +08:00 |
|
|
caoyanyi
|
f5c2c5f6fb
|
* Fix bug #31891.
|
2023-02-03 11:06:04 +08:00 |
|
|
caoyanyi
|
6d66b07932
|
+ Add test case.
|
2023-02-03 10:09:25 +08:00 |
|
|
guofeilong
|
88ce3756d6
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 10:07:58 +08:00 |
|
|
王怡栋
|
4f3fa1662f
|
Merge branch 'master_xieqiyu_30064' into 'master'
* Code for bug#30064.
See merge request easycorp/zentaopms!6849
|
2023-02-03 02:07:42 +00:00 |
|
|
guofeilong
|
f2e45b7cd2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 10:07:37 +08:00 |
|
|
王怡栋
|
b60f089db6
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
* Code for css in admin.
See merge request easycorp/zentaopms!6850
|
2023-02-03 02:05:54 +00:00 |
|
|
王怡栋
|
5e6a2e6026
|
Merge branch 'dev/gfl_updateCssFile_zui' into 'master'
* Code for css in admin theme.
See merge request easycorp/zentaopms!6851
|
2023-02-03 02:05:38 +00:00 |
|
|
guofeilong
|
03d869e8d3
|
* Code for css in admin theme.
|
2023-02-03 10:01:55 +08:00 |
|
|
guofeilong
|
9f4b496c24
|
* Code for css in admin.
|
2023-02-03 09:59:05 +08:00 |
|
|
liuhong
|
a1cbb18b66
|
* Adjust code for 30389.
|
2023-02-03 01:51:32 +00:00 |
|
|
liuhong
|
d9cb8817e3
|
* Adjuct code for 30389.
|
2023-02-03 01:50:17 +00:00 |
|
|
tianshujie
|
778f20a47b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 09:48:48 +08:00 |
|
|
xieqiyu
|
16f0a9feec
|
* Code for bug#30064.
|
2023-02-03 09:45:24 +08:00 |
|
|
wangyidong
|
1f1e8b0836
|
* fix bug #31519.
|
2023-02-03 08:48:18 +08:00 |
|
|
caoyanyi
|
e16e72162e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 16:59:09 +08:00 |
|
|
caoyanyi
|
8c13b67e83
|
* Optimize page style.
|
2023-02-02 16:58:37 +08:00 |
|
|
王怡栋
|
db6eaa622f
|
Merge branch 'dev/gfl_add_icon_horn_and_download-alt' into 'master'
* code for add icon download-alt and horn
See merge request easycorp/zentaopms!6848
|
2023-02-02 08:57:33 +00:00 |
|
|
王怡栋
|
3f9c3e40e1
|
Merge branch 'zentaopms284_bug#31889' into 'master'
* Fix bug #31889.
See merge request easycorp/zentaopms!6846
|
2023-02-02 08:57:17 +00:00 |
|
|
王怡栋
|
2cbb844240
|
Merge branch 'sprint/f2039' into 'master'
* Fix feedback2039.
See merge request easycorp/zentaopms!6844
|
2023-02-02 08:53:20 +00:00 |
|
|
王怡栋
|
ee5db15cd3
|
Merge branch 'hufangzhou_autopack' into 'master'
* Add the mark for auto pack, and integrate the table creation statement.
See merge request easycorp/zentaopms!6847
|
2023-02-02 08:52:53 +00:00 |
|