孙广明
|
7cfb1c2e9c
|
Merge branch 'tianshujie_19306' into 'master'
* Fix bug #19306.
See merge request easycorp/zentaopms!1819
|
2022-02-16 01:58:28 +00:00 |
|
tianshujie
|
e22bd59961
|
* Fix bug #19306.
|
2022-02-16 09:57:17 +08:00 |
|
朱金勇
|
c9b8ad34a6
|
Merge branch 'sprint/scx_editorlang' into 'master'
*Translate lang.
See merge request easycorp/zentaopms!1818
|
2022-02-16 01:42:30 +00:00 |
|
孙广明
|
b44ac97ace
|
Merge branch 'sprint/184_hufangzhou_19649' into 'master'
* Fix bug #19649.
See merge request easycorp/zentaopms!1817
|
2022-02-16 01:41:32 +00:00 |
|
songchenxuan
|
b7eacca5eb
|
*Translate lang.
|
2022-02-16 09:37:37 +08:00 |
|
孙广明
|
abb38d4709
|
* Fix details.
|
2022-02-16 09:36:21 +08:00 |
|
hufangzhou
|
f9cc2702f9
|
* Fix bug #19649.
|
2022-02-16 09:24:11 +08:00 |
|
孙广明
|
3332272ff9
|
Merge branch 'sprint/184_hufangzhou_19558' into 'master'
* Fix bug #19558.
See merge request easycorp/zentaopms!1815
|
2022-02-16 00:34:32 +00:00 |
|
hufangzhou
|
92b25b7d4e
|
* Adjust the directory path to full path.
|
2022-02-15 17:26:04 +08:00 |
|
hufangzhou
|
a67e9ce403
|
* Adjust the file path to full path.
|
2022-02-15 17:21:27 +08:00 |
|
hufangzhou
|
f0ba4e7987
|
* Fix bug #19558.
|
2022-02-15 17:12:01 +08:00 |
|
王怡栋
|
4987c816df
|
Merge branch 'sgm_jira' into 'master'
* Fix var name.
See merge request easycorp/zentaopms!1814
|
2022-02-15 09:10:49 +00:00 |
|
孙广明
|
13614b0772
|
* Fix var name.
|
2022-02-15 17:06:11 +08:00 |
|
李玉春
|
0c55a20565
|
Merge branch 'devops_cyy_49125' into 'master'
* Modify page style.
See merge request easycorp/zentaopms!1812
|
2022-02-15 07:31:21 +00:00 |
|
caoyanyi
|
5c9b06bdfb
|
* Modify page style.
|
2022-02-15 15:27:16 +08:00 |
|
孙广明
|
57b2229ea3
|
Merge branch 'sprint/184_tianshujie_file' into 'master'
* Modify the path to get the file.
See merge request easycorp/zentaopms!1811
|
2022-02-15 07:19:01 +00:00 |
|
tianshujie
|
c44dfa1788
|
* Modify the path to get the file.
|
2022-02-15 15:16:14 +08:00 |
|
孙广明
|
8dc7ece5b4
|
Merge branch '184/mayue_modify_trash' into 'master'
* Fix bug #19569.
See merge request easycorp/zentaopms!1810
|
2022-02-15 07:12:11 +00:00 |
|
mayue
|
3037621f77
|
* Fix bug #19569.
|
2022-02-15 15:07:54 +08:00 |
|
liyuchun
|
d8b8d9252e
|
Merge branch 'sunhuawei_fixbug_19247'
|
2022-02-15 13:42:08 +08:00 |
|
李玉春
|
459f6a2076
|
Merge branch 'master' into 'sunhuawei_fixbug_19247'
# Conflicts:
# module/execution/css/story.css
|
2022-02-15 05:41:51 +00:00 |
|
李玉春
|
4baa0d2f7c
|
Merge branch 'devops21_zhangzilong_19249' into 'master'
* Code for bug #19249.
See merge request easycorp/zentaopms!1809
|
2022-02-15 05:37:45 +00:00 |
|
zhangzilong
|
2d9606bd71
|
* Code for bug #19249.
|
2022-02-15 13:35:33 +08:00 |
|
孙华伟
|
aaf936b061
|
Fix bug #19247 #19435 #19239.
|
2022-02-15 13:29:03 +08:00 |
|
孙广明
|
9e171958bf
|
Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.
See merge request easycorp/zentaopms!1800
|
2022-02-15 05:27:00 +00:00 |
|
李玉春
|
d3f7997c56
|
Merge branch 'devops21_zhangzilong_19249' into 'master'
* Fix bug #19249.
See merge request easycorp/zentaopms!1802
|
2022-02-15 05:26:51 +00:00 |
|
孙华伟
|
742614e0da
|
Fix bug #19247 #19435 #19239
|
2022-02-15 13:25:12 +08:00 |
|
zhangzilong
|
7efdd3e0c5
|
* Fix bug #19249.
|
2022-02-15 13:24:04 +08:00 |
|
李玉春
|
26d6df18d8
|
Merge branch 'sprint/fixbug_zxd_19343' into 'master'
*Fix bug #19343.
See merge request easycorp/zentaopms!1805
|
2022-02-15 05:16:39 +00:00 |
|
李玉春
|
f7a880c17f
|
Merge branch 'sprint/fixbug_zxd_19555' into 'master'
*Fix bug #19555.
See merge request easycorp/zentaopms!1806
|
2022-02-15 05:15:57 +00:00 |
|
周旭东
|
27fcc308e1
|
Update sprintblock.html.php
|
2022-02-15 05:14:07 +00:00 |
|
周旭东
|
117a240287
|
Update kanban.html.php
|
2022-02-15 05:13:13 +00:00 |
|
李玉春
|
0dc860fdf9
|
Merge branch 'devops_cyy_49125' into 'master'
* Finish task #49125.
See merge request easycorp/zentaopms!1803
|
2022-02-15 05:11:30 +00:00 |
|
孙广明
|
51e18d07dc
|
Merge branch 'sprint/184_hufangzhou_jira' into 'master'
* Optimize the implementation of jira data import interface.
See merge request easycorp/zentaopms!1807
|
2022-02-15 05:08:17 +00:00 |
|
李玉春
|
7edeab44af
|
Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844
See merge request easycorp/zentaopms!1795
|
2022-02-15 05:05:31 +00:00 |
|
朱金勇
|
211596a0ab
|
Merge branch 'sprint/scx_addlang' into 'master'
Add translate lang.
See merge request easycorp/zentaopms!1799
|
2022-02-15 04:00:47 +00:00 |
|
hufangzhou
|
40d488317e
|
* Optimize the implementation of jira data import interface.
|
2022-02-15 12:00:28 +08:00 |
|
孙华伟
|
dfdb2f629e
|
Fix bug #19247.
|
2022-02-15 11:22:31 +08:00 |
|
zhouxudong
|
a0aa2260d6
|
*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.*Fix bug #19555.
|
2022-02-15 11:19:34 +08:00 |
|
zhouxudong
|
bc31a203ae
|
*Fix bug #19343.
|
2022-02-15 10:45:33 +08:00 |
|
caoyanyi
|
f2bdff075d
|
* Modify table width.
|
2022-02-15 10:17:59 +08:00 |
|
孙广明
|
abf746ad62
|
Merge branch 'sprint/184_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!1801
|
2022-02-15 02:17:39 +00:00 |
|
王怡栋
|
af7fcb8a45
|
Merge branch 'sgm_jira' into 'master'
Sgm jira
See merge request easycorp/zentaopms!1804
|
2022-02-15 02:15:31 +00:00 |
|
孙广明
|
6af0d96e29
|
* Fix jira style.
|
2022-02-15 10:11:07 +08:00 |
|
caoyanyi
|
8ee4cb1eed
|
* Modify data check.
|
2022-02-15 10:04:04 +08:00 |
|
caoyanyi
|
fb735fe0ba
|
* Modify data check.
|
2022-02-15 10:02:14 +08:00 |
|
caoyanyi
|
41f55b388c
|
* Finish task #49125.
|
2022-02-15 09:57:33 +08:00 |
|
zhangzilong
|
07063776a6
|
* Fix bug #19249.
|
2022-02-15 09:42:47 +08:00 |
|
hufangzhou
|
231105cb37
|
* Add the devops story list to CHANGELOG.
|
2022-02-15 09:36:41 +08:00 |
|
孙广明
|
9e9a9f1735
|
* Code for jira.
|
2022-02-15 08:49:42 +08:00 |
|