0405061cfa
Merge pull request #586 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'ad0ec97b860afcb17249e3f82b3231078658f77f':
CHART-9760 国际化
4 years ago
Bjorn
ad0ec97b86
Pull request #583 : CHART-9760 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit '4b2309740bdaa948467e0dc3a2d1ac67aea5e922':
CHART-9760 国际化
4 years ago
4b2309740b
CHART-9760 国际化
4 years ago
9b32b3d2da
Merge pull request #581 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'f7d0906c507427006653cb75fa7a92bb588a879e':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
f7d0906c50
Pull request #576 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'c901feea1425dae32dccbe8d9ba2f2de057139e5':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
c901feea14
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
22f8a5e967
Merge pull request #565 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '0fcbfbc46c7b77773c5c2156405b4a5b24bccb32':
REPORT-26209 国际化CRM模板->代码库同步
系列和数据点提示界面
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Qinghui.Liu
0fcbfbc46c
Pull request #561 : CHART-14744 系列和数据点提示界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'c53b4c4d7d92347f99c7b5c91d4e882757583194':
系列和数据点提示界面
4 years ago
lidongy
5368c9cf19
Pull request #562 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '84de2345e8bfb65ebef8bf1d316d492daa65b2b6':
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
84de2345e8
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
8072f76718
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~lidongy/design-i18n into release/10.0
4 years ago
Qinghui.Liu
c53b4c4d7d
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/10.0
4 years ago
Qinghui.Liu
aa39b1fa12
系列和数据点提示界面
4 years ago
1dfaf2487c
Merge pull request #559 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '39508257fe3325f82b17f9b8f6aef175df59523d':
4 years ago
39508257fe
Merge pull request #558 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '7d19a3f31a37a7a654db2552942c961f3227e7a3':
4 years ago
7d19a3f31a
Merge pull request #557 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'd74edd569c551b0481ec362994fc2d74d0cb0dce':
4 years ago
d74edd569c
Merge pull request #556 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'ba5fa181c004152b03a36d24d5fe53e78d85f22f':
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
调整
解决冲突
REPORT-26209 国际化CRM模板->代码库同步
REPORT-33236
REPORT-33236
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-13666 国际化
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
f3ef489d05
Merge pull request #545 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c127c074020265b9c7016ed5c0b3a60ca19a782f':
整理数据集数据
REPORT-35307 将原本的「校验出错信息」，改为「不满足校验公式则提示」并国际化
填充数据集数据界面
CHART-11549 初始化箱型图界面
4 years ago
c127c07402
Pull request #542 : CHART-14744 箱型图界面
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit 'ab0c29b1b8dd7fd9bbedfa7a8e4fec7347f358b7':
整理数据集数据
填充数据集数据界面
CHART-11549 初始化箱型图界面
4 years ago
lidongy
6cb800f56f
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~lidongy/design-i18n into release/10.0
4 years ago
177b34918e
Pull request #537 : REPORT-35307 将原本的「校验出错信息」，改为「不满足校验公式则提示」并国际化
...
Merge in DESIGN/design-i18n from ~YUAN.WANG/design-i18n:release/10.0 to release/10.0
* commit '328a9cda3f30e611286eba097e2715d902db8d33':
REPORT-35307 将原本的「校验出错信息」，改为「不满足校验公式则提示」并国际化
4 years ago
Qinghui.Liu
ab0c29b1b8
整理数据集数据
4 years ago
Yuan.Wang
328a9cda3f
Merge branch 'release/10.0' of https://code.fineres.com/scm/~yuan.wang/design-i18n into release/10.0
4 years ago
Yuan.Wang
120f6e82b9
REPORT-35307 将原本的「校验出错信息」，改为「不满足校验公式则提示」并国际化
4 years ago
lidongy
4b41c8604b
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Qinghui.Liu
043fe5c6c4
填充数据集数据界面
4 years ago
Qinghui.Liu
dd694b7f30
CHART-11549 初始化箱型图界面
4 years ago
0e276af8cb
Merge pull request #514 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'e6ff2cb588426db67aa8b0bd366fbf03b8fba917':
CHART-14663 国际化
4 years ago
Bjorn
e6ff2cb588
Pull request #511 : CHART-14663 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit '3f3d82d818cbd2a1abce408d9d9d1089edc9f983':
CHART-14663 国际化
4 years ago
3f3d82d818
CHART-14663 国际化
4 years ago
06f3959ab7
Merge pull request #509 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '6d6f7263ba8c576dac914eac5c1784343bcf2196':
4 years ago
6d6f7263ba
Merge pull request #508 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'ba5fa181c004152b03a36d24d5fe53e78d85f22f':
4 years ago
ba5fa181c0
Pull request #504 : 无jira任务， release/10.0 合 final/10.0
...
Merge in DESIGN/design-i18n from release/10.0 to final/10.0
* commit '80402c95f393bb1ac4ceea27279992905d7e3dec':
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
调整
解决冲突
REPORT-26209 国际化CRM模板->代码库同步
REPORT-33236
REPORT-33236
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-13666 国际化
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
870d3e8b77
Pull request #501 : 无jira任务， release/10.0 合 bugfix/10.0
...
Merge in DESIGN/design-i18n from release/10.0 to bugfix/10.0
* commit '80402c95f393bb1ac4ceea27279992905d7e3dec':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
80402c95f3
Pull request #498 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'e723481f32fd3f5c853b3ea49b3a2a0d953f26d8':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
e723481f32
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
52d8669bb0
Pull request #496 : REPORT-26209 release->bugfix
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:bugfix/10.0 to bugfix/10.0
* commit 'fc5326a1208432c187609f0fde31286775f0754c': (237 commits)
REPORT-26209 国际化CRM模板->代码库同步
调整
解决冲突
REPORT-26209 国际化CRM模板->代码库同步
REPORT-33236
REPORT-33236
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-13666 国际化
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-13666 国际化
MOBILE-27532 单选／复选按钮组自适应高度
REPORT-26209 国际化CRM模板->代码库同步
REPORT-26209 国际化CRM模板->代码库同步
CHART-14191 国际化
CHART-14182 新增国际化key
...
4 years ago
lidongy
fc5326a120
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lidongy/design-i18n into bugfix/10.0
...
# Conflicts:
# design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
4 years ago
lidongy
55cc364da4
Pull request #495 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'd7fd0bcb0003d60a5ade2ad89f2de132386d0be8':
REPORT-26209 国际化CRM模板->代码库同步
调整
解决冲突
4 years ago
lidongy
d7fd0bcb00
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
lidongy
a874aaad10
调整
4 years ago
lidongy
5743a19f62
解决冲突
4 years ago
Harrison
84ce290fba
Pull request #493 : 无jira任务，final 合并 release， 解决冲突
...
Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:release/10.0 to release/10.0
* commit 'dca8945a73e7b0dbebd8b18144b339a5d7e5b5e0':
MOBILE-27220 表单移动端属性加一个“默认”和“自定义样式”开关
REPORT-32251 翻译补充
REPORT-32251 bugfix->release 未合国际化 手动提交下
REPORT-29503【国际化】导出Excel按钮，设计器内翻译与工具栏翻译不一致
无JIRA任务，release10 -> 10
无JIRA任务， release/10.0 - > 10.0
REPORT-11752 国际化问题
REPORT-11789 自定义按钮名字被改了
REPORT-11692 alphafine分词查询结果中包含了连词结果
4 years ago
dca8945a73
Merge branch 'final/10.0' of https://code.fineres.com/scm/~lucian.chen/design-i18n into release/10.0
...
Conflicts:
design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
4 years ago
ac7debda0d
Pull request #491 : 无jira任务， persist/10.0 合 final/10.0
...
Merge in DESIGN/design-i18n from persist/10.0 to final/10.0
* commit '18ab0511996802070ea1c5a081b70f79f63c4b2a':
无JIRA任务，release10 -> 10
无JIRA任务， release/10.0 - > 10.0
REPORT-11752 国际化问题
REPORT-11789 自定义按钮名字被改了
REPORT-11692 alphafine分词查询结果中包含了连词结果
4 years ago
lidongy
43ad8d9aae
Pull request #489 : REPORT-26209 国际化CRM模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'fa66d4462bde1abcf753e0f201455d6c47c97cd8':
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Jimmy.Zheng
442ddab7e2
Pull request #488 : REPORT-33236 迭代任务
...
Merge in DESIGN/design-i18n from ~JIMMY.ZHENG/design-i18n:release/10.0 to release/10.0
* commit '0a2391af3777b1158a312d46fb35d5d54dacb249':
REPORT-33236
REPORT-33236
4 years ago
lidongy
fa66d4462b
REPORT-26209 国际化CRM模板->代码库同步
4 years ago
Jimmy.Zheng
0a2391af37
REPORT-33236
4 years ago
Jimmy.Zheng
c3d6cdad74
REPORT-33236
4 years ago
superman
Bjorn
白岳
lidongy
lidongy
Qinghui.Liu
eason
Yuan.Wang
Yuan.Wang
Kara
ju.ju
Harrison
lucian
Jimmy.Zheng