superman
e7ac2ae509
Merge pull request #1441 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '39de66c2c3bbb7672b99555a1438adf562882810':
4 years ago
superman
39de66c2c3
Merge pull request #1440 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'c836020cc3712da7ffbcd04b76b0fc5892be3a8b':
4 years ago
superman
c836020cc3
Merge pull request #1439 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'adeaf8e05d04b508e6efc64b3c4a29e249ec07be':
4 years ago
superman
adeaf8e05d
Merge pull request #1438 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'a68496f69fa0b34fa744ffbcbb3b42a71ab49c05':
4 years ago
superman
a68496f69f
Merge pull request #1437 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '66e1e6fcd4e64dae76fed5c7855f5de05c814fe0':
4 years ago
superman
2e35af60d2
Merge pull request #1430 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '573ee1507596fbca5963fd02182742eaf88c6837':
REPORT-26209 chore: 国际化crm模板->代码库同步
REPORT-26209 chore: 国际化crm模板->代码库同步
4 years ago
superman
573ee15075
Merge pull request #1429 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'a8b61bbb0ba67b3d2f34e75282cc6bf7fbe5007b':
REPORT-26209 chore: 国际化crm模板->代码库同步
REPORT-26209 chore: 国际化crm模板->代码库同步
4 years ago
lidongy
a8b61bbb0b
Pull request #1426 : REPORT-26209 chore: 国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'c3955533d7da1d5891ad3a2d01679328982b207b':
REPORT-26209 chore: 国际化crm模板->代码库同步
REPORT-26209 chore: 国际化crm模板->代码库同步
4 years ago
lidongy
c3955533d7
REPORT-26209 chore: 国际化crm模板->代码库同步
4 years ago
lidongy
f9c82cbd88
REPORT-26209 chore: 国际化crm模板->代码库同步
4 years ago
superman
9b74e4b35b
Merge pull request #1424 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '3550d08ffed6e69769f209b3d1ee7e772c5b011e':
MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
4 years ago
superman
3550d08ffe
Merge pull request #1423 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '27175ef30bf5c9cdfe44a933a7f7ca4d514fbced':
MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
4 years ago
wei
27175ef30b
Pull request #1415 : MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
...
Merge in DESIGN/design-i18n from ~JOHNTSAI/design-i18n:release/10.0 to release/10.0
* commit '9faca1b32e6123983848635f106fc571e53f8272':
MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
4 years ago
johntsai
9faca1b32e
Merge remote-tracking branch 'upstream/release/10.0' into release/10.0
4 years ago
johntsai
812f927568
MOBILE-30240
...
移动端控件顺序名字改下 修正中文字段值
4 years ago
Henry.Wang
ebde5bc188
Pull request #1409 : REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化
...
Merge in DESIGN/design-i18n from ~HENRY.WANG/design-i18n:feature/10.0 to feature/10.0
* commit 'fb6b6875fcc0213d9b3f57e6d222e5d840f207d7':
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化
4 years ago
Henry.Wang
fb6b6875fc
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化
4 years ago
superman
61614d7a2c
Merge pull request #1382 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '27a0086e156f768963e1508722e4609806506030':
fix:CHART-17209 地图配置
4 years ago
superman
27a0086e15
Merge pull request #1381 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '87e0d2902e9ab78fe8d7868a81dc6d1a574ed9f5':
fix:CHART-17209 地图配置
4 years ago
superman
87e0d2902e
Merge pull request #1380 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '66e1e6fcd4e64dae76fed5c7855f5de05c814fe0':
4 years ago
superman
66e1e6fcd4
Merge pull request #1379 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'cf2ce793ebd5937751049eb440c78ca101cbbeb4':
4 years ago
eason
5495c98bfb
Pull request #1378 : CHART-17209 地图配置
...
Merge in DESIGN/design-i18n from ~EASON/design-i18n:release/10.0 to release/10.0
* commit '280498df9084af430382ba0c021b7e8029295759':
fix:CHART-17209 地图配置
4 years ago
eason
280498df90
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~eason/design-i18n into release/10.0
4 years ago
eason
2bb4970bba
fix:CHART-17209 地图配置
4 years ago
superman
8225965bef
Merge pull request #1377 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit 'f7ec40d8edcefc59a4a5798d009af54de65bde47':
4 years ago
superman
cf2ce793eb
Merge pull request #1374 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '789c5868adc44c79561ccd10251bdf260d464762':
4 years ago
superman
af413dc5c8
Merge pull request #1339 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'f7ec40d8edcefc59a4a5798d009af54de65bde47':
4 years ago
superman
f7ec40d8ed
Merge pull request #1338 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '720ac9d375b61730d0b2b1f7195aa888b65e4c84':
4 years ago
superman
720ac9d375
Merge pull request #1337 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '789c5868adc44c79561ccd10251bdf260d464762':
4 years ago
superman
789c5868ad
Merge pull request #1336 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '3712a226f8d16a21b5225931c593914463773d83':
4 years ago
superman
3712a226f8
Merge pull request #1335 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'c2ccbb4e28f673cb5328115c55af8d58f7784451':
REPORT-42606 国际化显示问题
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
调整
REPORT-35149 增加国际化key
修改
REPORT-35149 预定义样式功能feature合到release
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-40646 远程设计对接平台密码策略 国际化
CHART-15902 分类轴标签显示方式界面
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
7c796f8270
Merge pull request #1318 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'a1b282b5f3ef1756e513549fc541779cee282dc8':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
a1b282b5f3
Merge pull request #1317 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '9104b8187c0eeefd2d6b403928781a8ccd267dab':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
9104b8187c
Pull request #1314 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit 'fb34b6d461d89d1f1397388c6a00ac706fea01d1':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
fb34b6d461
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
737e91f153
Merge pull request #1297 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '44c44c8ba95e00487d2f4ae13b82ab88fedab97a':
REPORT-42606 国际化显示问题
4 years ago
superman
44c44c8ba9
Merge pull request #1296 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '9e1fc2dd3dd553a95ad872d9673a17e4435d1bfe':
REPORT-42606 国际化显示问题
4 years ago
superman
9e1fc2dd3d
Merge pull request #1295 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'c2ccbb4e28f673cb5328115c55af8d58f7784451':
REPORT-42606 国际化显示问题
4 years ago
Kara
c2ccbb4e28
Pull request #1293 : REPORT-42606 国际化显示问题
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:final/10.0 to final/10.0
* commit 'f6f288e7329f875fccbf46fbb879ee602bdb7c97':
REPORT-42606 国际化显示问题
4 years ago
hades
f6f288e732
REPORT-42606 国际化显示问题
4 years ago
superman
2eb7aa8578
Merge pull request #1291 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '0104f77b8bced9e30aa2f382588e9b11abe1fefc':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
0104f77b8b
Merge pull request #1290 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '1795fc7885f667d8bec241af568128e937806be8':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
1795fc7885
Merge pull request #1289 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'b87c5a0b7782faf580b33b7ff5f5b8f0f2774733':
4 years ago
superman
b87c5a0b77
Merge pull request #1287 in DESIGN/design-i18n from release/10.0 to final/10.0
...
* commit 'a87bb48280fd67959db785d119cd3ebcfede84e0':
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
调整
REPORT-35149 增加国际化key
修改
REPORT-35149 预定义样式功能feature合到release
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-40646 远程设计对接平台密码策略 国际化
CHART-15902 分类轴标签显示方式界面
REPORT-26209 chore:国际化crm模板->代码库同步
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
a87bb48280
Pull request #1286 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '250ef66a5b18b9b8d6eb2d167a36d73cbd8843a8':
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
lidongy
250ef66a5b
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
ju
6f8d8e187d
Pull request #1279 : 无jira任务,解决冲突
...
Merge in DESIGN/design-i18n from ~KERRY/design-i18n:feature/10.0 to feature/10.0
* commit '467caff3beb2a652e94a3200ce3d83fed6ae88ac':
REPORT-26209 chore:国际化crm模板->代码库同步
调整
4 years ago
kerry
467caff3be
Merge branch 'bugfix/10.0' of ssh://code.fineres.com:7999/~kerry/design-i18n into feature/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
superman
cf6b9a1606
Merge pull request #1277 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'f18d17479a3599560ebf04d45b7d5c39df8eca00':
REPORT-26209 chore:国际化crm模板->代码库同步
调整
4 years ago
lidongy
f18d17479a
Pull request #1269 : REPORT-26209 chore:国际化crm模板->代码库同步
...
Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0
* commit '70c21ef800811a0bf6b01cd27be752ab143fa16f':
REPORT-26209 chore:国际化crm模板->代码库同步
调整
4 years ago