ju|剧浩宇
aee3df3944
Pull request #1592 : 无jira 解决冲突
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0
* commit '4b7ffc916b8f6777f6d1a1bfce2d5a73ea7250c5':
REPORT-45689 添加国际化
4 years ago
hades
4b7ffc916b
无jira 解决冲突
4 years ago
superman
1f7893f7c3
Merge pull request #1590 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '0717c110a15539c16fa6a642419e419b8a17fbd6':
REPORT-45689 添加国际化
4 years ago
Hades
0717c110a1
Pull request #1587 : REPORT-45689 添加国际化
...
Merge in DESIGN/design-i18n from ~HADES/design-i18n:release/10.0 to release/10.0
* commit '80cb711380b0fc06aaef6034724a2e66d1ea5f8d':
REPORT-45689 添加国际化
4 years ago
hades
80cb711380
REPORT-45689 添加国际化
4 years ago
Bjorn
c0e77fdf53
Pull request #1581 : CHART-15837 国际化
...
Merge in DESIGN/design-i18n from ~BJORN/design-i18n:feature/10.0 to feature/10.0
* commit '1df7dca9bd2a1deee19b772423afcb1623396bf9':
CHART-15837 国际化
4 years ago
白岳
1df7dca9bd
CHART-15837 国际化
4 years ago
superman
271c727176
Merge pull request #1561 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'ee6524820c85b1a4fa27c551782c2a907a4dba57':
4 years ago
superman
ee6524820c
Merge pull request #1560 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '7acf661cb314b48a2f57660ae723d9d891962883':
4 years ago
superman
7acf661cb3
Merge pull request #1557 in DESIGN/design-i18n from bugfix/10.0 to release/10.0
...
* commit '177eb6a55567ddfcdcff80841b9271f422607f3f':
4 years ago
superman
7ac267872c
Merge pull request #1545 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '177eb6a55567ddfcdcff80841b9271f422607f3f':
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 feature->release
4 years ago
superman
177eb6a555
Merge pull request #1536 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit 'a34bf9408044d8e922a5ab020a6a47e485cac983':
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 feature->release
4 years ago
Henry.Wang
a34bf94080
Pull request #1528 : REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 feature->release
...
Merge in DESIGN/design-i18n from ~HENRY.WANG/design-i18n:release/10.0 to release/10.0
* commit 'be9c7bbc5614f8587b66ff74738c387aeb20f8e1':
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 feature->release
4 years ago
Henry.Wang
be9c7bbc56
REPORT-42240 【10.0.13】设计器里功能描述(表单、组件)优化 feature->release
4 years ago
superman
1543ba13db
Merge pull request #1511 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit 'f52353af38873495d9bf370d441fb853f3745c55':
4 years ago
superman
f52353af38
Merge pull request #1510 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '063f40bce5d5c89c424099babdad9e82540683dc':
4 years ago
superman
063f40bce5
Merge pull request #1509 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '9ed70665efb19c7d52b552988793b7dab791bf51':
4 years ago
superman
9ed70665ef
Merge pull request #1508 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'df9c91e9c7f87bf24e14949bdae6085288f3528b':
4 years ago
superman
df9c91e9c7
Merge pull request #1506 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '54f6261aa11c2b38ad2c1397f1140271c482af00':
4 years ago
superman
1223ff8720
Merge pull request #1504 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0
...
* commit '398c39d23f680ccde816133a626e393792c1c38e':
4 years ago
superman
398c39d23f
Merge pull request #1503 in DESIGN/design-i18n from release/10.0 to bugfix/10.0
...
* commit '2bf68676611f9d080c514656a42ab92fe69c22fe':
4 years ago
superman
2bf6867661
Merge pull request #1502 in DESIGN/design-i18n from final/10.0 to release/10.0
...
* commit '54f6261aa11c2b38ad2c1397f1140271c482af00':
4 years ago
superman
54f6261aa1
Merge pull request #1501 in DESIGN/design-i18n from persist/10.0 to final/10.0
...
* commit 'd0a5cdc4b4050177d60fb6d48d1d59bc8cc5216a':
4 years ago
superman
d0a5cdc4b4
Merge pull request #1500 in DESIGN/design-i18n from final/10.0 to persist/10.0
...
* commit '9f8fdd4e2112424845029633abebfcd13a3057a5':
4 years ago
ju|剧浩宇
ec8244b0e9
Pull request #1498 : 无jira任务,bugfix合feature,解决冲突
...
Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:feature/10.0 to feature/10.0
* commit 'b820f463ea7a1cf284049ca0cad2453eb195122e':
REPORT-43744 【10.0.13】插件与jar包不匹配问题优化
4 years ago
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