Yvan
2269d82dd2
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
6f87c96dfb
REPORT-37915 报表分栏弹窗显示未适配国际化
...
1. 为每种语言都适配了报表分栏弹窗中的示例图片
2. 修改对应国际化文件中代表此示例图片的文件名
4 years ago
superman
d007973b1e
Merge pull request #764 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'fc77b5736e2c9ec56fd4a18be5911b5dc5885f47':
CHART-15442 新图表箱型图改名为箱形图
4 years ago
Kara
fc77b5736e
Pull request #762 : CHART-15442 新图表箱型图改名为箱形图
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:final/10.0 to final/10.0
* commit 'fbadd1825ec230499d6448c214845d0b1014a401':
CHART-15442 新图表箱型图改名为箱形图
4 years ago
Qinghui.Liu
fbadd1825e
CHART-15442 新图表箱型图改名为箱形图
4 years ago
lidongy
e594741736
Pull request #761 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'c965de0808628c7ffef24cf72823732dff72665d':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
c965de0808
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
f142bba0ca
Pull request #748 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '740198abacd4623489c9bdef202f600f493b928e':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
740198abac
REPORT-26209 国际化crm模板->代码库同步
4 years ago
Hans
de0250dfde
Pull request #731 : MOBILE-28888 Tab手势样式设计器端开发
...
Merge in DESIGN/design-i18n from ~HANS/design-i18n:release/10.0 to release/10.0
* commit '4b6edc641d7dcea28e76ba50b5c780c04410631a':
MOBILE-28888 Tab手势样式设计器端开发 1. 移动端Tab属性面板新增三个tab通用属性,显示标题,滑动切换,显示圆点指示器(通用样式设置) 2. 兼容旧模版,转换Tab就样式分散的属性到Tab属性面板的通用属性 3. 新增中英文翻译
4 years ago
lidongy
880d1e5e16
Pull request #730 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '0e9323dd634251e44367f86c06b11d0d774c8f96':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
Hans
4b6edc641d
MOBILE-28888 Tab手势样式设计器端开发
...
1. 移动端Tab属性面板新增三个tab通用属性,显示标题,滑动切换,显示圆点指示器(通用样式设置)
2. 兼容旧模版,转换Tab就样式分散的属性到Tab属性面板的通用属性
3. 新增中英文翻译
4 years ago
lidongy
0e9323dd63
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
5e5628abf6
Merge pull request #727 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'f3ec8460b849d8434d439fa89fe5e803291e6282':
4 years ago
superman
f3ec8460b8
Merge pull request #726 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '600ab553c78bf86d1eb1d4f0808a6cdb2884b270':
4 years ago
superman
600ab553c7
Merge pull request #725 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'c8ee32c761be35bce2ce20baa6f8b1f372eba83e': (25 commits)
REPORT-26209 国际化crm模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-14912 国际化
CHART-14928 数据格式改为数据形式
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
解决冲突
CHART-11549 修改箱型图条件属性界面
REPORT-26209 国际化CRM模板->代码库同步
无jira任务 打包
REPORT-35463 添加了“BUG需求反馈”和“技术支持”的KEY
REPORT-26209 国际化CRM模板->代码库同步
CHART-9760 国际化
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
系列和数据点提示界面
整理数据集数据
REPORT-35307 将原本的「校验出错信息」,改为「不满足校验公式则提示」并国际化
...
4 years ago
lidongy
4135770050
Pull request #719 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'a966c70b5a9df570d5b223140ed469e45078f529':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
a966c70b5a
REPORT-26209 国际化crm模板->代码库同步
4 years ago
superman
69c03601d2
Merge pull request #708 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'c8ee32c761be35bce2ce20baa6f8b1f372eba83e':
4 years ago
Kara
c8ee32c761
Pull request #706 : Final/10.0
...
Merge in DESIGN/design-i18n from ~JEO/design-i18n:final/10.0 to final/10.0
* commit 'cdf97173c4d5bf4fee0a5b892e8f6a6c0e63d10c': (25 commits)
REPORT-26209 国际化crm模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-14912 国际化
CHART-14928 数据格式改为数据形式
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
解决冲突
CHART-11549 修改箱型图条件属性界面
REPORT-26209 国际化CRM模板->代码库同步
无jira任务 打包
REPORT-35463 添加了“BUG需求反馈”和“技术支持”的KEY
REPORT-26209 国际化CRM模板->代码库同步
CHART-9760 国际化
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
系列和数据点提示界面
整理数据集数据
REPORT-35307 将原本的「校验出错信息」,改为「不满足校验公式则提示」并国际化
...
4 years ago
lidongy
cdf97173c4
Pull request #693 : REPORT-26209 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '9aaaa9abe6b516d0a34612e5994c49cd87f2707c':
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
9aaaa9abe6
REPORT-26209 国际化crm模板->代码库同步
4 years ago
lidongy
3a614dce60
Pull request #692 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'ee394c234da5fc0822562333b20cd31689f58c84':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
ee394c234d
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
e8225f7e53
Pull request #675 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'aa0a0a761a5f5547235755ec40c11907a44c0d84':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
aa0a0a761a
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
bfde8b0ed6
Pull request #658 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '18c6d7442f940527e7c26b64ee7cfda67c837f7e':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
18c6d7442f
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Bjorn
0688726f79
Pull request #653 : CHART-14912 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit 'c5baf199b92bcefc9f4660c2ee6c9b28faea0366':
CHART-14912 国际化
4 years ago
白岳
c5baf199b9
CHART-14912 国际化
4 years ago
superman
dc92f74d34
Merge pull request #648 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit '07b80814a0841b1ce267b8a87c9b5bcd1554f2e9':
无jira任务 打包
REPORT-26837 国际化
4 years ago
Qinghui.Liu
4186cce3af
Pull request #647 : CHART-14928 数据格式改为数据形式
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'e4cd9f2484a82e759b8bcfb1ff0907398494ddb6':
CHART-14928 数据格式改为数据形式
4 years ago
Qinghui.Liu
e4cd9f2484
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
8dc44323bf
CHART-14928 数据格式改为数据形式
4 years ago
superman
07b80814a0
Merge pull request #645 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c16a0f4be9e7c518b3b78599bab821a42d8d9e57':
CHART-12124 国际化
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
c16a0f4be9
Pull request #641 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'cc275051ee78d049516efecea2eec1bb0088d647':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Bjorn
3658c0d3f0
Pull request #642 : CHART-12124 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit 'b98c883513f6913893d1711e3e8e426ef1fe1e13':
CHART-12124 国际化
4 years ago
白岳
b98c883513
CHART-12124 国际化
4 years ago
lidongy
cc275051ee
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
019432cd81
Merge pull request #631 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '6fd6c99cedb3308ec2aed42118d8773bec8bf594':
解决冲突
CHART-11549 修改箱型图条件属性界面
4 years ago
Qinghui.Liu
6fd6c99ced
Pull request #628 : CHART-11549 修改箱型图条件属性界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit '12b09c6c25d58b8004baea8d80f2c51579632991':
解决冲突
CHART-11549 修改箱型图条件属性界面
4 years ago
Qinghui.Liu
12b09c6c25
解决冲突
4 years ago
Qinghui.Liu
5f95094e77
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
6f4c259f6a
CHART-11549 修改箱型图条件属性界面
4 years ago
superman
3c6b3e7e0c
Merge pull request #626 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'b01bae16a8029ecb8472bf98f05cd64426800563':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
b01bae16a8
Pull request #623 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'aaa112990679048c14fd4a9a12849f820b17da2d':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
aaa1129906
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
superman
94db00241a
Merge pull request #617 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c9073f48a0459d086fd394e24507cf0744e46c83':
4 years ago
superman
c9073f48a0
Merge pull request #616 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '2df2a99ea276369b1150ffa3eec3a902050611b2':
4 years ago
superman
2df2a99ea2
Merge pull request #615 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'c42ff1745760fafccafaef51d9f61f0dabd7d4e7':
4 years ago