 wangyidong
|
35fa42992c
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-01-31 16:19:10 +08:00 |
|
|
wangyidong
|
7af8d535f1
|
* code for task #83439.
|
2023-01-31 16:15:00 +08:00 |
|
|
caoyanyi
|
746bb0da84
|
* Modify language check.
|
2023-01-31 16:14:18 +08:00 |
|
|
caoyanyi
|
85ee9918c0
|
* Modify website check.
|
2023-01-31 15:25:46 +08:00 |
|
|
caoyanyi
|
062200535c
|
* Modify page style.
|
2023-01-31 13:54:21 +08:00 |
|
|
王怡栋
|
6c7b6863c0
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
Dev/gfl task #83327
See merge request easycorp/zentaopms!6809
|
2023-01-31 05:25:10 +00:00 |
|
|
tianshujie
|
d795f17a8e
|
* Finish task #83329.
|
2023-01-31 13:23:05 +08:00 |
|
|
guofeilong
|
e99e2adad0
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327
|
2023-01-31 10:59:18 +08:00 |
|
|
guofeilong
|
e11aa068a3
|
* code for style in offical-content
|
2023-01-31 10:54:49 +08:00 |
|
|
guofeilong
|
0ab09e26c2
|
* code for task #83433
|
2023-01-31 10:46:16 +08:00 |
|
|
guofeilong
|
ffe1ccdbe8
|
* code for lang
|
2023-01-31 10:25:38 +08:00 |
|
|
guofeilong
|
0959b76706
|
* code for css in plug
|
2023-01-31 09:14:53 +08:00 |
|
|
caoyanyi
|
15d3a2a5ac
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-01-31 08:56:37 +08:00 |
|
|
王怡栋
|
d8ed3dbca6
|
Merge branch 'sprint/285_navigation' into 'sprint/285'
* Finish task #83329.
See merge request easycorp/zentaopms!6804
|
2023-01-31 00:49:07 +00:00 |
|
|
王怡栋
|
27d762ff59
|
Merge branch 'zentaopms284_wangyuting' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!6803
|
2023-01-31 00:48:35 +00:00 |
|
|
王怡栋
|
b25d6fb0ff
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
* code for task_#83327
See merge request easycorp/zentaopms!6802
|
2023-01-31 00:48:03 +00:00 |
|
|
guofeilong
|
e7468f1699
|
* code for css in admin.html
|
2023-01-31 08:27:03 +08:00 |
|
|
wangyuting2
|
b4efdef521
|
* Optimize code.
|
2023-01-31 08:25:31 +08:00 |
|
|
tianshujie
|
8b5f786bd2
|
* Finish task #83329.
|
2023-01-30 17:23:10 +08:00 |
|
|
guofeilong
|
6ce4ae36ec
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327
|
2023-01-30 17:20:05 +08:00 |
|
|
caoyanyi
|
02f6b95c20
|
* Add extension list.
|
2023-01-30 17:11:28 +08:00 |
|
|
guofeilong
|
6df1f2daa6
|
* code for task_#83327
|
2023-01-30 16:37:24 +08:00 |
|
|
王怡栋
|
1856a26312
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
* code for task #83327
See merge request easycorp/zentaopms!6798
|
2023-01-30 08:04:43 +00:00 |
|
|
王怡栋
|
b75714f5b1
|
Merge branch 'zentaopms_284_task_#83030' into 'master'
* Finish task #83030.
See merge request easycorp/zentaopms!6800
|
2023-01-30 08:03:30 +00:00 |
|
|
王怡栋
|
6e2288d96d
|
Merge branch 'zentaopms284_task#82065' into 'master'
* Send an email to the dispatcher when closing a bug or requirement.
See merge request easycorp/zentaopms!6801
|
2023-01-30 08:02:48 +00:00 |
|
|
wangyuting2
|
88b0a68ee0
|
* Send an email to the dispatcher when closing a bug or requirement.
|
2023-01-30 15:41:50 +08:00 |
|
|
孙广明
|
94771c4901
|
Merge branch 'revert-967b1c73' into 'master'
Revert "Merge branch 'lyk_ticket_287' into 'master'"
See merge request easycorp/zentaopms!6799
|
2023-01-30 07:40:58 +00:00 |
|
|
孙广明
|
6d0110a732
|
Revert "Merge branch 'lyk_ticket_287' into 'master'"
This reverts merge request !6797
|
2023-01-30 07:40:49 +00:00 |
|
|
daitingting
|
af2dc8014c
|
* Finish task #83030.
|
2023-01-30 07:32:19 +00:00 |
|
|
guofeilong
|
44b526f9fc
|
* code for task #83327
|
2023-01-30 14:57:46 +08:00 |
|
|
孙广明
|
7d95c8a911
|
Merge branch 'master_xieqiyu_31461' into 'master'
Master xieqiyu 31461
See merge request easycorp/zentaopms!6796
|
2023-01-30 05:36:34 +00:00 |
|
|
孙广明
|
967b1c7326
|
Merge branch 'lyk_ticket_287' into 'master'
* Resolve ticket #287.
See merge request easycorp/zentaopms!6797
|
2023-01-30 05:36:21 +00:00 |
|
|
liuyongkai
|
f1030b3c5e
|
* Resolve ticket #287.
|
2023-01-30 13:27:38 +08:00 |
|
|
xieqiyu
|
9bada2157b
|
* Delete unused code.
|
2023-01-30 10:04:52 +08:00 |
|
|
xieqiyu
|
fa78b0914f
|
* Fix bug#31461.
|
2023-01-30 10:03:31 +08:00 |
|
|
wangyidong
|
516d773d1d
|
* fix bug #31718.
|
2023-01-30 09:01:15 +08:00 |
|
|
王怡栋
|
73bc6538d0
|
Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug
See merge request easycorp/zentaopms!6794
|
2023-01-30 00:37:19 +00:00 |
|
|
孙广明
|
827f9c9508
|
Merge branch 'fixbug_liumengyi_31808' into 'master'
* Fix bug #31808.
See merge request easycorp/zentaopms!6795
|
2023-01-30 00:34:10 +00:00 |
|
|
liumengyi
|
ba1f64daf9
|
* Fix bug #31808.
|
2023-01-30 08:29:51 +08:00 |
|
|
wangyidong
|
b4598b8738
|
* fix bug #31725.
|
2023-01-29 17:18:40 +08:00 |
|
|
tianshujie
|
5968e26cd9
|
* Fix bug #28027.
|
2023-01-29 17:02:06 +08:00 |
|
|
王怡栋
|
5ce0bb3c97
|
Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389 :if delete execution directly the execute is empty.
See merge request easycorp/zentaopms!6793
|
2023-01-29 08:49:21 +00:00 |
|
|
tianshujie
|
1d2c6ee0f6
|
* Fix bug #27999.
|
2023-01-29 16:46:56 +08:00 |
|
|
tianshujie
|
7ca322300b
|
* Fix bug #25848.
|
2023-01-29 16:21:42 +08:00 |
|
|
tianshujie
|
0b4897b2bb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tianshujie_fixbug
|
2023-01-29 16:15:27 +08:00 |
|
|
tianshujie
|
dec6df72b2
|
* Fix bug #25848.
|
2023-01-29 16:15:06 +08:00 |
|
|
liuhong
|
3a2ef158b5
|
* Fix bug #30389 :if delete execution directly the execute is empty.
|
2023-01-29 08:00:24 +00:00 |
|
|
tianshujie
|
30ed2fd65c
|
* Fix bug #25848.
|
2023-01-29 15:58:48 +08:00 |
|
|
王怡栋
|
10371d204b
|
Merge branch 'sprint/hufangzhou_jenkinsTest' into 'master'
* Modify for trigger jenkins.
See merge request easycorp/zentaopms!6792
|
2023-01-29 07:44:57 +00:00 |
|
|
hufangzhou
|
a1bafd0f38
|
* Modify for trigger jenkins.
|
2023-01-29 07:43:12 +00:00 |
|