 王怡栋
|
8bbc43b99c
|
Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.
See merge request easycorp/zentaopms!4468
|
2022-07-12 07:23:46 +00:00 |
|
|
孙广明
|
398a5f47f7
|
Merge branch 'sprint216_60640' into 'master'
* Code for task#60640
See merge request easycorp/zentaopms!4477
|
2022-07-12 07:17:01 +00:00 |
|
|
zhouxudong
|
09eabd3b84
|
* Finish task #60393.
|
2022-07-12 07:15:27 +00:00 |
|
|
zenggang
|
6a84cd7469
|
* Code for task#60640
|
2022-07-12 07:15:13 +00:00 |
|
|
王怡栋
|
58941466a6
|
Merge branch 'master_xieqiyu_fixKanbanBug' into 'master'
* Fix bug of story and bug action in execution.
See merge request easycorp/zentaopms!4471
|
2022-07-12 07:03:09 +00:00 |
|
|
王怡栋
|
1aa2f24efc
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of create project when select all branch.
See merge request easycorp/zentaopms!4470
|
2022-07-12 07:00:55 +00:00 |
|
|
王怡栋
|
39d3d083ad
|
Merge branch 'sprint/master_zhouxudong_60376' into 'master'
* Finish task #60388.
See merge request easycorp/zentaopms!4469
|
2022-07-12 06:57:01 +00:00 |
|
|
孙广明
|
507eb73497
|
Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.
See merge request easycorp/zentaopms!4473
|
2022-07-12 06:28:56 +00:00 |
|
|
mayue
|
0a5cf0a831
|
* Optimize code.
|
2022-07-12 14:28:17 +08:00 |
|
|
mayue
|
a21626979e
|
* Fix bug #25081.
|
2022-07-12 14:25:58 +08:00 |
|
|
xieqiyu
|
658a187e47
|
* Fix bug of story and bug action in execution.
|
2022-07-12 14:05:40 +08:00 |
|
|
王怡栋
|
d47cde97d2
|
Merge branch 'master_xieqiyu_25030' into 'master'
* Fix bug#25030.
See merge request easycorp/zentaopms!4464
|
2022-07-12 05:31:04 +00:00 |
|
|
wangyidong
|
366f2ef207
|
Merge branch 'sprint/master_zhouxudong_60389'
|
2022-07-12 13:30:27 +08:00 |
|
|
王怡栋
|
a063544f5f
|
Merge branch 'master' into 'sprint/master_zhouxudong_60389'
# Conflicts:
# module/file/view/buildform.html.php
# module/file/view/viewfiles.html.php
|
2022-07-12 05:30:11 +00:00 |
|
|
zhouxudong
|
951d41d721
|
* Finish task #60393.
|
2022-07-12 02:54:06 +00:00 |
|
|
孙广明
|
d7afa0268b
|
Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.
See merge request easycorp/zentaopms!4467
|
2022-07-12 02:50:36 +00:00 |
|
|
孙广明
|
1f0652faa8
|
Merge branch 'sprint216_zg_60640' into 'master'
* Finish task#60640
See merge request easycorp/zentaopms!4466
|
2022-07-12 02:34:49 +00:00 |
|
|
zenggang
|
f3dd489f61
|
* Adjust code
|
2022-07-12 02:32:01 +00:00 |
|
|
zenggang
|
5d116c16c9
|
* Finish task#60640
|
2022-07-12 02:29:20 +00:00 |
|
|
mayue
|
14ace897ca
|
* Fix bug #24404.
|
2022-07-12 10:21:23 +08:00 |
|
|
xieqiyu
|
bd596ac686
|
* Fix bug#25030.
|
2022-07-12 09:32:31 +08:00 |
|
|
zhouxudong
|
2196d2746d
|
* Finish task #60388.
|
2022-07-12 01:05:21 +00:00 |
|
|
孙广明
|
107060744e
|
Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.
See merge request easycorp/zentaopms!4463
|
2022-07-12 00:54:34 +00:00 |
|
|
zhouxudong
|
6b66d72804
|
* Finish task #60387.
|
2022-07-12 00:51:29 +00:00 |
|
|
王怡栋
|
3ca4195444
|
Merge branch 'master_xieqiyu_25062' into 'master'
* Fix bug#25062.
See merge request easycorp/zentaopms!4460
|
2022-07-12 00:47:47 +00:00 |
|
|
王怡栋
|
af542ae500
|
Merge branch 'sprint/master_zhouxudong_60383' into 'master'
* Finish task #60387 #60386 #60383.
See merge request easycorp/zentaopms!4459
|
2022-07-12 00:47:35 +00:00 |
|
|
孙广明
|
5fcb433409
|
Merge branch 'sprint214_leiyong_task_60375' into 'master'
Sprint214 leiyong task 60375
See merge request easycorp/zentaopms!4456
|
2022-07-12 00:31:43 +00:00 |
|
|
xieqiyu
|
e7d7930b5b
|
* Fix bug#25062.
|
2022-07-12 08:13:36 +08:00 |
|
|
孙广明
|
62673467ef
|
Merge branch 'sprint212_fix_bug' into 'master'
* Delete icon.
See merge request easycorp/zentaopms!4443
|
2022-07-11 15:40:32 +00:00 |
|
|
mayue
|
9248adc1af
|
* Finish task #60639.
|
2022-07-11 18:10:09 +08:00 |
|
|
李玉春
|
0542089291
|
Merge branch 'sprint/wangzemei/bug24836' into 'master'
* Fix bug #24836
See merge request easycorp/zentaopms!4458
|
2022-07-11 09:34:24 +00:00 |
|
|
wangzemei
|
debc2e3365
|
* Fix bug #24836
|
2022-07-11 09:32:20 +00:00 |
|
|
leiyong
|
ce8d8d25eb
|
* Adjust icon.
|
2022-07-11 08:55:21 +00:00 |
|
|
leiyong
|
e30505ddb7
|
* Finish task#60380.
|
2022-07-11 08:26:04 +00:00 |
|
|
王怡栋
|
070b7b0b29
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_customer' into 'master'
* Add ZentaoIcon Customer
See merge request easycorp/zentaopms!4455
|
2022-07-11 08:25:23 +00:00 |
|
|
guofeilong
|
9d5451fb67
|
* Add ZentaoIcon Customer
|
2022-07-11 08:21:04 +00:00 |
|
|
wangyidong
|
6757d64f6e
|
* fix field type.
|
2022-07-11 16:16:59 +08:00 |
|
|
王怡栋
|
7bc7fe0e54
|
Merge branch 'sprint/master_zhouxudong_60389' into 'master'
Sprint/master zhouxudong 60389
See merge request easycorp/zentaopms!4451
|
2022-07-11 07:56:48 +00:00 |
|
|
王怡栋
|
4c3d59333a
|
Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.
See merge request easycorp/zentaopms!4450
|
2022-07-11 07:56:19 +00:00 |
|
|
王怡栋
|
e3439cedae
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_save' into 'master'
* Add ZentaoIcon Save
See merge request easycorp/zentaopms!4454
|
2022-07-11 07:54:51 +00:00 |
|
|
孙广明
|
4ad6e1d062
|
Merge branch 'sprint/216_mayue_task#60641' into 'master'
* Finish task #60641.
See merge request easycorp/zentaopms!4453
|
2022-07-11 07:28:47 +00:00 |
|
|
guofeilong
|
bf624cdc5d
|
* Add ZentaoIcon Save
|
2022-07-11 07:28:08 +00:00 |
|
|
mayue
|
ea0500a20c
|
* Finish task #60641.
|
2022-07-11 15:26:14 +08:00 |
|
|
leiyong
|
3a55d594c3
|
* Finish task#60375.
|
2022-07-11 07:18:52 +00:00 |
|
|
wangyidong
|
5446bcf1f4
|
Merge branch 'sprint/212_hufangzhou_59535'
|
2022-07-11 15:10:47 +08:00 |
|
|
王怡栋
|
e9809af13a
|
Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
# www/js/my.full.js
|
2022-07-11 07:10:23 +00:00 |
|
|
hufangzhou
|
3f2b98e71c
|
* Move the functions to my.full.js file.
|
2022-07-11 15:03:40 +08:00 |
|
|
hufangzhou
|
21dbff52ca
|
* Rename method names.
|
2022-07-11 14:57:43 +08:00 |
|
|
zhouxudong
|
d2fe52d3b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 06:55:36 +00:00 |
|
|
liumengyi
|
38a91dba02
|
* Optimize code for task#60395.
|
2022-07-11 14:52:26 +08:00 |
|