lucian
b820f463ea
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~lucian.chen/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_zh.properties
design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
4 years ago
superman
e2d57e512d
Merge pull request #1496 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '484d12c79a60b6952d45b3631626d14b46ddf510':
REPORT-43744 【10.0.13】插件与jar包不匹配问题优化
4 years ago
Lucian.Chen
484d12c79a
Pull request #1482 : REPORT-43744 【10.0.13】插件与jar包不匹配问题优化
...
Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:release/10.0 to release/10.0
* commit 'a256a625696d53dbf928e54fc2fa7708407357d8':
REPORT-43744 【10.0.13】插件与jar包不匹配问题优化
4 years ago
superman
ff975e5a51
Merge pull request #1492 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '514f0bedcb5d3917193e465fb67ec08e5fdd4011':
CHART-17494 修改点地图标记点
4 years ago
superman
514f0bedcb
Merge pull request #1491 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'a01ddb493361450ca77057417e11a2a4b5140b19':
CHART-17494 修改点地图标记点
4 years ago
Qinghui.Liu
a01ddb4933
Pull request #1488 : CHART-17494 修改点地图标记点
...
Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0
* commit '01999fab5999b4a36b589175826016005330db16':
CHART-17494 修改点地图标记点
4 years ago
Qinghui.Liu
01999fab59
CHART-17494 修改点地图标记点
4 years ago
lucian
a256a62569
REPORT-43744 【10.0.13】插件与jar包不匹配问题优化
4 years ago
superman
edee412e4c
Merge pull request #1470 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'b4dde74ac6e3cca9100bea6863d3bd1e9d635169':
4 years ago
superman
b4dde74ac6
Merge pull request #1469 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '30c9a78d61c24bb23ff06718ef0619bd4c8cd48b':
4 years ago
superman
30c9a78d61
Merge pull request #1468 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '9f8fdd4e2112424845029633abebfcd13a3057a5':
4 years ago
superman
9f8fdd4e21
Merge pull request #1467 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit '994a230a7db298c1736351ce5e834af8bc3644fe':
4 years ago
superman
994a230a7d
Merge pull request #1466 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit 'c5aa0cc6a42f56762af22359201e198efbe8d519':
REPORT-26209 chore: 国际化crm模板->代码库同步
REPORT-26209 chore: 国际化crm模板->代码库同步
MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
fix:CHART-17209 地图配置
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
superman
9a4edfd0d8
Merge pull request #1453 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '5dda39a330bcc95641f1688a10d760c0cc3e07b8':
CHART-15835 国际化
4 years ago
superman
5dda39a330
Merge pull request #1452 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '6807010d6290d79bcb1de34c805447b4141d0a5d':
CHART-15835 国际化
4 years ago
superman
6807010d62
Merge pull request #1451 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit 'c5aa0cc6a42f56762af22359201e198efbe8d519':
4 years ago
Bjorn
6b5d1dddd6
Pull request #1449 : CHART-15835 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0
* commit '8303cd9eb175b1e57131e14c24b8e70db965cd9f':
CHART-15835 国际化
4 years ago
白岳
8303cd9eb1
CHART-15835 国际化
4 years ago
superman
c5aa0cc6a4
Merge pull request #1448 in DESIGN/design-i18n from release/10.0 to final/10.0
...
* commit 'c836020cc3712da7ffbcd04b76b0fc5892be3a8b':
REPORT-26209 chore: 国际化crm模板->代码库同步
REPORT-26209 chore: 国际化crm模板->代码库同步
MOBILE-30240 移动端控件顺序名字改下 修正中文字段值
fix:CHART-17209 地图配置
REPORT-26209 chore:国际化crm模板->代码库同步
4 years ago
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