 孙广明
|
4acb2e69ec
|
* Fix bug #30658.
|
2022-12-15 15:17:10 +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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
guofeilong
|
cc0f45f690
|
* icon-snap-house: rename icon
|
2022-12-15 04:13:51 +00:00 |
|
|
guofeilong
|
dc28cb0b60
|
* ZUI: icon-name: snap-house rename
|
2022-12-15 04:02:13 +00:00 |
|
|
wangyidong
|
30a72c2685
|
* adjust style.
|
2022-12-15 11:08:01 +08:00 |
|
|
guofeilong
|
56250e3bbd
|
* ZUI: update icons: wrench desktop snap-house
|
2022-12-15 02:58:00 +00:00 |
|
|
孙广明
|
cfd9e136bc
|
* Fix bug #30878.
|
2022-12-15 10:42:59 +08:00 |
|
|
chaideqing
|
4f5d210d1f
|
* Fix feedback 1657.
|
2022-12-15 10:40:07 +08:00 |
|
|
liuhong
|
0dc5fbdb33
|
* Fix bug #30845.
|
2022-12-15 02:17:42 +00:00 |
|
|
wangyidong
|
6391ddfe1e
|
* adjust style.
|
2022-12-15 10:11:25 +08:00 |
|
|
孙广明
|
4a718900d2
|
* Fix bug #30870.
|
2022-12-15 10:05:16 +08:00 |
|
|
liuhong
|
b9d86da835
|
* Finish task #79667.
|
2022-12-15 01:59:52 +00:00 |
|
|
孙广明
|
0d1495522b
|
* Finish task #79446.
|
2022-12-15 09:57:19 +08:00 |
|
|
wangyidong
|
6c02c05d51
|
* fix bug #30676.
|
2022-12-15 09:18:46 +08:00 |
|
|
liuhong
|
60f676a765
|
* Adjust code #79667.
|
2022-12-14 07:21:37 +00:00 |
|
|
liuhong
|
09a83ba0bb
|
* Adjust code #79667.
|
2022-12-14 07:09:53 +00:00 |
|
|
liuhong
|
bec14c9a4a
|
* Adjust code 79667.
|
2022-12-14 07:06:19 +00:00 |
|
|
liuhong
|
a212284f2b
|
* Adjust code #79667
|
2022-12-14 06:42:32 +00:00 |
|
|
liuhong
|
ed3ad33c77
|
* Adjust code #79667.
|
2022-12-14 06:41:17 +00:00 |
|
|
孙广明
|
4b14d842d2
|
* Finish task #79447.
|
2022-12-14 14:39:41 +08:00 |
|
|
孙广明
|
a118120919
|
* Add title.
|
2022-12-14 14:27:38 +08:00 |
|
|
liuhong
|
37f6342e30
|
* upload files.
|
2022-12-14 06:24:01 +00:00 |
|
|
孙广明
|
507ac90e83
|
* Finish task #79441.
|
2022-12-14 14:21:51 +08:00 |
|
|
孙广明
|
b654a1f43d
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79665#79466
See merge request easycorp/zentaopms!6542
|
2022-12-14 06:15:04 +00:00 |
|
|
孙广明
|
c8fbb5633c
|
Merge branch 'master_xieqiyu_79668' into 'master'
Master xieqiyu 79668
See merge request easycorp/zentaopms!6544
|
2022-12-14 06:14:49 +00:00 |
|
|
孙广明
|
8d8696b1e4
|
Merge branch 'master_xieqiyu_79662' into 'master'
* Code for task#79662.
See merge request easycorp/zentaopms!6548
|
2022-12-14 06:14:08 +00:00 |
|
|
wangyidong
|
5b48a564f0
|
* adjust style for release view page.
|
2022-12-14 14:12:36 +08:00 |
|
|
xieqiyu
|
fc17dfc949
|
* Code for task#79662.
|
2022-12-14 14:10:49 +08:00 |
|
|
王怡栋
|
e14725f9b8
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6547
|
2022-12-14 05:45:24 +00:00 |
|
|
hufangzhou
|
6cef691b39
|
* Add the new version.
|
2022-12-14 05:28:51 +00:00 |
|
|
孙广明
|
05f7ad5035
|
* Finish task #79442.
|
2022-12-14 13:10:06 +08:00 |
|
|
liuhong
|
fd30e0a006
|
* Finish task #79667.
|
2022-12-14 04:49:43 +00:00 |
|
|
liuhong
|
33d35425cc
|
* Adjust code for task #79667.
|
2022-12-14 04:40:20 +00:00 |
|
|
liuhong
|
95056fd6cd
|
* draft code task #79667.
|
2022-12-14 04:09:51 +00:00 |
|
|
王怡栋
|
3657178a04
|
Merge branch 'zentaopms273_wyd' into 'master'
* adjust for style.
See merge request easycorp/zentaopms!6546
|
2022-12-14 03:34:01 +00:00 |
|