 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 |
|
|
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 |
|
|
wangyidong
|
2975445f53
|
* fix bug for admin menu.
|
2023-02-02 09:43:48 +08:00 |
|
|
tanghucheng
|
e001f2a00b
|
* Fix bug #25334.
|
2023-02-02 09:42:45 +08:00 |
|
|
caoyanyi
|
9dd5fa61c0
|
* Optimize system block style.
|
2023-02-02 09:36:22 +08:00 |
|
|
caoyanyi
|
6378c657d5
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 09:28:14 +08:00 |
|
|
tanghucheng
|
9709b3e5e9
|
* Fix bug #26685.
|
2023-02-02 09:27:41 +08:00 |
|
|
caoyanyi
|
43a8635da4
|
* Modify system menu style.
|
2023-02-02 09:26:51 +08:00 |
|
|
王怡栋
|
f5cbc820ac
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
Dev/gfl task #83327
See merge request easycorp/zentaopms!6831
|
2023-02-02 01:26:17 +00:00 |
|
|
王怡栋
|
aea7178985
|
Merge branch 'sprint/feedback2047' into 'master'
* Fix feedback 2047.
See merge request easycorp/zentaopms!6834
|
2023-02-02 01:24:36 +00:00 |
|
|
王怡栋
|
f98b046674
|
Merge branch 'master_bug_30814' into 'master'
* Fix bug #30814
See merge request easycorp/zentaopms!6833
|
2023-02-02 01:24:04 +00:00 |
|
|
guofeilong
|
24d59a3ef8
|
* code for handle confilct
|
2023-02-02 09:22:28 +08:00 |
|
|
王怡栋
|
183929538c
|
Merge branch 'bugfix/workflowFile20230201' into 'master'
* Resolved feedback #2065, workflow extend file type field can not linkage.
See merge request easycorp/zentaopms!6835
|
2023-02-02 01:20:04 +00:00 |
|
|
wangyidong
|
3dacf0c938
|
* code for admin menu.
|
2023-02-02 09:18:49 +08:00 |
|
|
tanghucheng
|
b295a994e4
|
* Fix bug #26718.
|
2023-02-02 09:13:45 +08:00 |
|
|
caoyanyi
|
fdec4693a3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 09:10:56 +08:00 |
|
|
caoyanyi
|
0395e9266d
|
* Modify lite vision system style.
|
2023-02-02 09:10:15 +08:00 |
|
|
hufangzhou
|
3d4ae057f3
|
* Fix bug for bug #30770.
|
2023-02-02 01:08:42 +00:00 |
|
|
孙广明
|
59a70a4a00
|
Merge branch 'songpeiyan_bug#30856' into 'master'
*Fix bug #30856
See merge request easycorp/zentaopms!6829
|
2023-02-02 00:46:04 +00:00 |
|
|
tanghucheng
|
61c09d7c32
|
* Fix bug #29989.
|
2023-02-02 08:43:52 +08:00 |
|
|
songpeiyan
|
bdd962fe94
|
* Fix bug #30856
|
2023-02-02 08:43:27 +08:00 |
|
|
guofeilong
|
c86bc8f8a5
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327
|
2023-02-02 08:29:30 +08:00 |
|
|
孔令茂
|
b15855b19b
|
* Resolved feedback #2065, workflow extend file type field can not linkage.
|
2023-02-01 17:24:56 +08:00 |
|
|
guofeilong
|
96aa9e19b1
|
* handle conflict
|
2023-02-01 17:21:33 +08:00 |
|
|
wangyidong
|
95dcbf524e
|
* code for task #83434.
|
2023-02-01 17:21:14 +08:00 |
|
|
王怡栋
|
182ce3e6a3
|
Merge branch 'master_xieqiyu_30144' into 'master'
* Fix bug#30144.
See merge request easycorp/zentaopms!6826
|
2023-02-01 09:16:20 +00:00 |
|