 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 |
|
|
guofeilong
|
f2e45b7cd2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-03 10:07:37 +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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
guofeilong
|
8aa04874b3
|
* code for add icon download-alt and horn
|
2023-02-02 16:49:32 +08:00 |
|
|
hufangzhou
|
c27e0ae9a6
|
* Add the mark for auto pack, and integrate the table creation statement.
|
2023-02-02 08:48:58 +00:00 |
|
|
wangyuting2
|
40e5f5bdde
|
* Fix bug #31889.
|
2023-02-02 16:37:46 +08:00 |
|
|
wangyidong
|
81820d5145
|
* fix bug #31887.
|
2023-02-02 16:00:42 +08:00 |
|
|
guofeilong
|
5f629ca690
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 14:50:15 +08:00 |
|
|
王怡栋
|
5c019e1a81
|
Merge branch 'dev/gfl_updatecssFile_zui' into 'master'
* code for theme class in task #83327
See merge request easycorp/zentaopms!6842
|
2023-02-02 06:45:56 +00:00 |
|
|
王怡栋
|
330da9b6b2
|
Merge branch 'master_bug' into 'master'
*Fix the testtask and testcase creatBug open new label.
See merge request easycorp/zentaopms!6841
|
2023-02-02 06:45:31 +00:00 |
|
|
王怡栋
|
a2f9c43632
|
Merge branch 'master_xieqiyu_31453' into 'master'
* Code for bug#31453.
See merge request easycorp/zentaopms!6840
|
2023-02-02 06:44:43 +00:00 |
|
|
王怡栋
|
b58569c505
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
Dev/gfl task #83327
See merge request easycorp/zentaopms!6843
|
2023-02-02 06:44:25 +00:00 |
|
|
guofeilong
|
6ba62547fb
|
* code for theme class in task #83327
|
2023-02-02 14:39:32 +08:00 |
|
|
guofeilong
|
124ae901b8
|
* handle conflict
|
2023-02-02 14:37:39 +08:00 |
|
|
guofeilong
|
cb33c5b173
|
* code for theme css admin
|
2023-02-02 14:36:42 +08:00 |
|
|
xieqiyu
|
7a0e43b41b
|
* Code for bug#31453.
|
2023-02-02 14:12:29 +08:00 |
|
|
liuhong
|
2d3cfc3613
|
*Fix the testtask and testcase creatBug open new label.
|
2023-02-02 05:59:18 +00:00 |
|
|
wangyidong
|
c8adcb47a5
|
* adjust for common lang.
|
2023-02-02 13:55:52 +08:00 |
|
|
王怡栋
|
34ccab2ae9
|
Merge branch 'master_xieqiyu_31453' into 'master'
* Fix bug#31453.
See merge request easycorp/zentaopms!6838
|
2023-02-02 05:48:39 +00:00 |
|
|
王怡栋
|
d0c837df51
|
Merge branch 'master_xieqiyu_30968' into 'master'
* Fix bug#30968.
See merge request easycorp/zentaopms!6837
|
2023-02-02 05:46:18 +00:00 |
|
|
王怡栋
|
939089b325
|
Merge branch 'sprint/fixbug_tanghucheng' into 'master'
* Fix bug #25334.
See merge request easycorp/zentaopms!6836
|
2023-02-02 05:45:48 +00:00 |
|
|
caoyanyi
|
2072f14285
|
* Modify nav style.
|
2023-02-02 13:32:05 +08:00 |
|
|
朱金勇
|
20ba4f390c
|
Merge branch 'fix/compatible' into 'master'
* Fix compatible error.
See merge request easycorp/zentaopms!6832
|
2023-02-02 03:46:31 +00:00 |
|
|
鲁飞
|
741917d2ab
|
* Fix compatible error.
|
2023-02-02 03:46:31 +00:00 |
|
|
caoyanyi
|
b9b1906c61
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 11:33:25 +08:00 |
|
|
caoyanyi
|
e8f4b52e10
|
* Modify font color.
|
2023-02-02 11:33:02 +08:00 |
|
|
chaideqing
|
9d8914a776
|
* Fix feedback2039.
|
2023-02-02 03:20:03 +00:00 |
|
|
xieqiyu
|
1e11a3cb85
|
* Fix bug#31453.
|
2023-02-02 11:12:46 +08:00 |
|
|
wangyidong
|
911d7de31a
|
* adjust for admin unit testing.
|
2023-02-02 10:54:35 +08:00 |
|
|
caoyanyi
|
47e7fbc765
|
* Optimize page style.
|
2023-02-02 10:47:39 +08:00 |
|
|
caoyanyi
|
038a09cc9b
|
* Update svg file.
|
2023-02-02 10:37:02 +08:00 |
|
|
xieqiyu
|
2468300051
|
* Fix bug#30968.
|
2023-02-02 10:06:33 +08:00 |
|
|
tanghucheng
|
fe1f695c43
|
* Fix bug #24998.
|
2023-02-02 10:01:24 +08:00 |
|
|
caoyanyi
|
702cb679fb
|
* Modify extension list.
|
2023-02-02 09:47:24 +08:00 |
|