 朱金勇
|
b04e7295f1
|
Merge branch 'sprint/sunhao/update_kindeditor' into 'master'
* update kindeditor files.
See merge request easycorp/zentaopms!6551
|
2022-12-15 08:36:28 +00:00 |
|
|
王怡栋
|
2225fa3632
|
Merge branch 'zentaopms_bug_#30911' into 'master'
* Fix bug #30911.
See merge request easycorp/zentaopms!6566
|
2022-12-15 08:27:11 +00:00 |
|
|
王怡栋
|
b9828faff2
|
Merge branch 'bugfix/liwenrui/clientalert' into 'master'
* fix unable to alert and confirm in zentaoclient.
See merge request easycorp/zentaopms!6563
|
2022-12-15 08:26:58 +00:00 |
|
|
孙广明
|
1222fd65f0
|
Merge branch 'sprint/hufangzhou_xuancommit' into 'master'
* Adjust the xuanxuan commit.
See merge request easycorp/zentaopms!6570
|
2022-12-15 08:22:23 +00:00 |
|
|
hufangzhou
|
5b13b13d43
|
* Adjust the xuanxuan commit.
|
2022-12-15 08:21:11 +00:00 |
|
|
孙广明
|
c893ac76d8
|
Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907
See merge request easycorp/zentaopms!6567
|
2022-12-15 08:20:12 +00:00 |
|
|
孙广明
|
7ab740a26b
|
Merge branch 'master_xieqiyu_30901' into 'master'
* Fix bug#30901.
See merge request easycorp/zentaopms!6568
|
2022-12-15 08:20:01 +00:00 |
|
|
孙广明
|
d72556fdb4
|
Merge branch 'sprint/scx_taskestimateapi' into 'master'
* Support pms effort.
See merge request easycorp/zentaopms!6569
|
2022-12-15 08:19:54 +00:00 |
|
|
xieqiyu
|
5c34348cd9
|
* Fix bug#30901.
|
2022-12-15 16:18:18 +08:00 |
|
|
liuhong
|
cc631b6e4f
|
* Adjust code #30907.
|
2022-12-15 08:15:03 +00:00 |
|
|
liuhong
|
a08eff199f
|
* Fix bug #30907.
|
2022-12-15 08:12:15 +00:00 |
|
|
daitingting
|
d241f76e49
|
* Fix bug #30911.
|
2022-12-15 08:10:58 +00:00 |
|
|
孙广明
|
47817d9153
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879
See merge request easycorp/zentaopms!6565
|
2022-12-15 08:10:30 +00:00 |
|
|
lanzongjun
|
9d0a087132
|
* Fix Bug #30879
|
2022-12-15 16:09:01 +08:00 |
|
|
孙广明
|
b827ae2002
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909
See merge request easycorp/zentaopms!6549
|
2022-12-15 07:58:29 +00:00 |
|
|
孙广明
|
2bcd6ed191
|
Merge branch 'master_xieqiyu_30844' into 'master'
* Fix bug#30844.
See merge request easycorp/zentaopms!6553
|
2022-12-15 07:57:10 +00:00 |
|
|
lanzongjun
|
a8551febe5
|
* Fix Bug #30909
|
2022-12-15 15:54:33 +08:00 |
|
|
孙广明
|
7bb5217ea9
|
Merge branch 'master_xieqiyu_79440' into 'master'
* Code for task#79440.
See merge request easycorp/zentaopms!6556
|
2022-12-15 07:53:13 +00:00 |
|
|
孙广明
|
bb418ee465
|
Merge branch 'sprint/fixbug_liumengyi_30896' into 'master'
* Fix bug #30896.
See merge request easycorp/zentaopms!6558
|
2022-12-15 07:52:58 +00:00 |
|
|
孙广明
|
2dd370e821
|
Merge branch 'master_xieqiyu_79444' into 'master'
* Code for task#79444.
See merge request easycorp/zentaopms!6560
|
2022-12-15 07:50:27 +00:00 |
|
|
孙广明
|
e173f7e3bf
|
Merge branch 'master_liuhong_30897' into 'master'
* Fix bug #30897.
See merge request easycorp/zentaopms!6561
|
2022-12-15 07:49:58 +00:00 |
|
|
孙广明
|
53c2ae7089
|
Merge branch 'master_xieqiyu_30803' into 'master'
* Fix bug#30803.
See merge request easycorp/zentaopms!6562
|
2022-12-15 07:49:22 +00:00 |
|
|
孙广明
|
a788dedd50
|
* Fix bug #30916.
|
2022-12-15 15:46:34 +08:00 |
|
|
宋辰轩
|
12c0a5ddcc
|
* Support pms effort.
|
2022-12-15 15:44:59 +08:00 |
|
|
孙广明
|
2a2ea5e9b0
|
* Remove unused code.
|
2022-12-15 15:33:15 +08:00 |
|
|
孙广明
|
4acb2e69ec
|
* Fix bug #30658.
|
2022-12-15 15:17:10 +08:00 |
|
|
Wenrui LI
|
ca0cbffb0b
|
* fix unable to alert and confirm in zentaoclient.
|
2022-12-15 15:17:08 +08:00 |
|
|
xieqiyu
|
e6d364c246
|
* Fix bug#30803.
|
2022-12-15 15:12:24 +08:00 |
|
|
王怡栋
|
6fe7f03e7e
|
Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576
See merge request easycorp/zentaopms!6530
|
2022-12-15 06:53:08 +00:00 |
|
|
王怡栋
|
1fe2f7694c
|
Merge branch 'bugfix/liwenrui/zentaobot' into 'master'
修复禅道机器人相关
See merge request easycorp/zentaopms!6559
|
2022-12-15 06:52:01 +00:00 |
|
|
liuhong
|
82a2cb0381
|
* Fix bug #30897.
|
2022-12-15 06:51:55 +00:00 |
|
|
lanzongjun
|
72f9a71865
|
* Fix Bug #30886
|
2022-12-15 14:51:51 +08:00 |
|
|
xieqiyu
|
6d970f0935
|
* Code for task#79444.
|
2022-12-15 14:33:39 +08:00 |
|
|
Wenrui LI
|
cf3c90d214
|
* fix unable to get correct execution of task via api, bug #30873.
|
2022-12-15 14:13:52 +08:00 |
|
|
Wenrui LI
|
a1c0f8d071
|
* fix default param of zentao bot view task, bug #30865.
|
2022-12-15 14:13:49 +08:00 |
|
|
孙广明
|
52ba26c18c
|
* Fix bug #30885.
|
2022-12-15 14:13:32 +08:00 |
|
|
liumengyi
|
bad559b500
|
* Fix bug #30896.
|
2022-12-15 14:07:26 +08:00 |
|
|
孙广明
|
ca6987d98a
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #30800.
See merge request easycorp/zentaopms!6557
|
2022-12-15 06:04:21 +00:00 |
|
|
田淑杰
|
6699ab0a60
|
* Fix bug #30800.
|
2022-12-15 14:02:23 +08:00 |
|
|
孙广明
|
a72aba558a
|
* Fix bug #30875.
|
2022-12-15 14:00:32 +08:00 |
|
|
lanzongjun
|
b4dd6cb307
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-15 13:54:20 +08:00 |
|
|
xieqiyu
|
fa65b4a6e0
|
* Code for task#79440.
|
2022-12-15 13:43:08 +08:00 |
|
|
孙广明
|
151a08af27
|
* Fix bug #30795.
|
2022-12-15 13:38:39 +08:00 |
|
|
孙广明
|
15c5490024
|
* Fix bug #30890.
|
2022-12-15 13:33:19 +08:00 |
|
|
孙广明
|
c71bd1f09b
|
Merge branch 'sprint_273_79667'
|
2022-12-15 13:31:13 +08:00 |
|
|
孙广明
|
dc7d8a5500
|
Merge branch 'master' into 'sprint_273_79667'
# Conflicts:
# module/story/lang/de.php
# module/story/lang/en.php
# module/story/lang/fr.php
# module/story/lang/zh-cn.php
|
2022-12-15 05:30:51 +00:00 |
|
|
孙广明
|
7e7ec61d7e
|
Merge branch 'master_liuhong_30845' into 'master'
* Fix bug #30845.
See merge request easycorp/zentaopms!6552
|
2022-12-15 05:28:23 +00:00 |
|
|
王怡栋
|
eb8e53f5ed
|
Merge branch 'sprint/feedback1657' into 'master'
Sprint/feedback1657
See merge request easycorp/zentaopms!6554
|
2022-12-15 05:10:07 +00:00 |
|
|
王怡栋
|
f15d14b8dd
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_desktop_wrench_snap-house' into 'master'
Sprint/zui guofeilong add icon desktop wrench snap house
See merge request easycorp/zentaopms!6555
|
2022-12-15 05:09:18 +00:00 |
|
|
guofeilong
|
b9926e36f1
|
* icon-snap-house: delete color
|
2022-12-15 04:17:54 +00:00 |
|