 孙广明
|
57ea3dc290
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
fix cp project js error
See merge request easycorp/zentaopms!6447
|
2022-12-02 00:59:43 +00:00 |
|
|
lanzongjun
|
8e1172e955
|
fix cp project js error
|
2022-12-02 08:50:07 +08:00 |
|
|
王怡栋
|
8047908575
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30274.
See merge request easycorp/zentaopms!6445
|
2022-12-01 09:00:59 +00:00 |
|
|
wangyidong
|
8007950ef9
|
* fix bug #30274.
|
2022-12-01 16:59:45 +08:00 |
|
|
王怡栋
|
9c5c781b52
|
Merge branch 'zentaopms_266_task_#77616' into 'master'
* Fix bug for task #77615,#77616.
See merge request easycorp/zentaopms!6444
|
2022-12-01 08:39:27 +00:00 |
|
|
daitingting
|
995f927ae6
|
* Fix bug for task #77615,#77616.
|
2022-12-01 08:36:46 +00:00 |
|
|
王怡栋
|
5aa2fda450
|
Merge branch 'zentaopms_266_bug#30429' into 'master'
* Fix bug #30429.
See merge request easycorp/zentaopms!6436
|
2022-12-01 07:58:03 +00:00 |
|
|
王怡栋
|
dc827982fe
|
Merge branch 'master_bug_23961' into 'master'
* Fix bug #23961.
See merge request easycorp/zentaopms!6432
|
2022-12-01 07:57:10 +00:00 |
|
|
王怡栋
|
00312f6d4f
|
Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358
See merge request easycorp/zentaopms!6431
|
2022-12-01 07:56:07 +00:00 |
|
|
王怡栋
|
7013e19604
|
Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403
See merge request easycorp/zentaopms!6428
|
2022-12-01 07:54:50 +00:00 |
|
|
朱金勇
|
fe071c9de7
|
Merge branch 'check_ext-gd' into 'master'
* Add check ext-gd extension.
See merge request easycorp/zentaopms!6430
|
2022-12-01 07:05:16 +00:00 |
|
|
孙广明
|
a315f7205f
|
Merge branch 'sprint/fixbug_liumengyi_30278' into 'master'
* Fix bug #30278.
See merge request easycorp/zentaopms!6439
|
2022-12-01 06:44:33 +00:00 |
|
|
孙广明
|
b191213fce
|
Merge branch 'lyk_feedback_1461' into 'master'
* Resolve feedback #1461.
See merge request easycorp/zentaopms!6440
|
2022-12-01 06:36:01 +00:00 |
|
|
wangyuting
|
2bd28233ea
|
* Fix bug #30429.
|
2022-12-01 06:28:13 +00:00 |
|
|
liuyongkai
|
80bd2c745c
|
* Resolve feedback #1461.
|
2022-12-01 14:25:21 +08:00 |
|
|
王怡栋
|
07ed3b2d9d
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30425.
See merge request easycorp/zentaopms!6434
|
2022-12-01 06:16:24 +00:00 |
|
|
wangyidong
|
22081a43de
|
* fix bug #30425.
|
2022-12-01 14:15:35 +08:00 |
|
|
chaideqing
|
3c3ce67354
|
* Refactor code.
|
2022-12-01 13:35:05 +08:00 |
|
|
Lufei
|
80d2e0f6c0
|
* Add check ext-gd extension.
|
2022-12-01 12:16:57 +08:00 |
|
|
chaideqing
|
ca3adef629
|
* Refactor code.
|
2022-12-01 11:15:52 +08:00 |
|
|
liumengyi
|
a6c8171286
|
* Fix bug #30278.
|
2022-12-01 10:33:59 +08:00 |
|
|
王怡栋
|
23f877b4f5
|
Merge branch 'zentaopms266_wyd' into 'master'
* adjust for task #77615,77616.
See merge request easycorp/zentaopms!6427
|
2022-12-01 02:29:06 +00:00 |
|
|
wangyidong
|
283b37b65e
|
* adjust for task #77615,77616.
|
2022-12-01 10:26:12 +08:00 |
|
|
chaideqing
|
756a9dc5a5
|
* Add vi lang.
|
2022-12-01 10:25:28 +08:00 |
|
|
chaideqing
|
6c3e107f78
|
* Refactor code.
|
2022-12-01 10:16:26 +08:00 |
|
|
chaideqing
|
bf3e8e33b3
|
* Fix feedback #1403 .
|
2022-11-30 21:07:12 +08:00 |
|
|
朱金勇
|
0cefe2dabd
|
Merge branch 'fix-extension' into 'master'
* Fix get extension files error for use softlink.
See merge request easycorp/zentaopms!6421
|
2022-11-30 10:36:09 +00:00 |
|
|
wangyidong
|
df0997aa70
|
* change deletereleased param to noreleased.
|
2022-11-30 17:11:17 +08:00 |
|
|
Lufei
|
3f556e626b
|
* Fix get extension files error for use softlink.
|
2022-11-30 16:57:52 +08:00 |
|
|
王怡栋
|
c9f918724e
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #29637.
See merge request easycorp/zentaopms!6419
|
2022-11-30 08:22:39 +00:00 |
|
|
wangyidong
|
943b177bc0
|
Merge branch 'zentaopms_266_bug#30341'
|
2022-11-30 16:22:09 +08:00 |
|
|
wangyidong
|
b2f9f3460b
|
* fix bug #29637.
|
2022-11-30 16:19:15 +08:00 |
|
|
王 于听
|
c96f03c532
|
Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
# module/testtask/control.php
|
2022-11-30 07:38:45 +00:00 |
|
|
wangyuting
|
069565c265
|
* Fix bug.
|
2022-11-30 07:37:21 +00:00 |
|
|
wangyuting
|
a125f33c4d
|
* Fix bug #30368.
|
2022-11-30 07:27:01 +00:00 |
|
|
wangyidong
|
eda06bcdc4
|
* fix bug #29680.
|
2022-11-30 14:55:45 +08:00 |
|
|
wangyuting
|
89edb08198
|
* Fix bug #30341.
|
2022-11-30 06:41:40 +00:00 |
|
|
wangyidong
|
fb69938202
|
Merge branch 'zentaopms_266_task_#77615'
|
2022-11-30 14:11:50 +08:00 |
|
|
王怡栋
|
2468d5cb60
|
Merge branch 'master' into 'zentaopms_266_task_#77615'
# Conflicts:
# module/bug/control.php
|
2022-11-30 06:11:28 +00:00 |
|
|
王怡栋
|
49f74f8f77
|
Merge branch 'zentaopms266_wyd' into 'master'
Zentaopms266 wyd
See merge request easycorp/zentaopms!6416
|
2022-11-30 06:07:34 +00:00 |
|
|
朱金勇
|
88dd3e8db3
|
Merge branch 'change-checksafefile' into 'master'
* If run in container, no need check ok.txt.
See merge request easycorp/zentaopms!6414
|
2022-11-30 06:05:27 +00:00 |
|
|
wangyidong
|
8efd793e38
|
* adjust for getBuildPairs method.
|
2022-11-30 14:04:32 +08:00 |
|
|
Lufei
|
35b4ba9e92
|
* If run in container, no need check ok.txt.
|
2022-11-30 11:19:31 +08:00 |
|
|
chaideqing
|
9fcb9099a7
|
* Fix feedback #1358.
|
2022-11-30 11:13:12 +08:00 |
|
|
daitingting
|
2fb8366405
|
* Finish task #77615,#77616.
|
2022-11-30 02:49:37 +00:00 |
|
|
wangyidong
|
e10acea921
|
* fix bug #30212.
|
2022-11-30 10:07:15 +08:00 |
|
|
王怡栋
|
c71b65d8b0
|
Merge branch 'zentaopms_266_task#77610' into 'master'
* Finish task #77610.
See merge request easycorp/zentaopms!6410
|
2022-11-30 02:06:19 +00:00 |
|
|
王怡栋
|
aa46a1a6bc
|
Merge branch 'sprint/konglingmao_feedback#508' into 'master'
* Resolved feedback #508, fixed image display error when export to html.
See merge request easycorp/zentaopms!6409
|
2022-11-30 02:04:50 +00:00 |
|
|
王怡栋
|
8dde745cbe
|
Merge branch 'master_bug_30061' into 'master'
* Fix bug #30061.
See merge request easycorp/zentaopms!6408
|
2022-11-30 02:03:29 +00:00 |
|
|
王怡栋
|
f667a850a1
|
Merge branch 'sprint/konglingmao_feedback#1514' into 'master'
* Resolved feedback #1514,add execution linkage when project empty.
See merge request easycorp/zentaopms!6389
|
2022-11-30 02:03:06 +00:00 |
|