Tree: fe409fdaed

10.0

bugfix/10.0

feature/10.0

feature/x

final/10.0

master

persist/10.0

qufenxi

release/10.0

research/10.0

10.0.10.2020.10.20

10.0.11.2020.11.25

10.0.12.2020.12.17

10.0.13.2021.01.19

10.0.7.2020.06.25

10.0.8.2020.07.16

10.0.8.2020.07.23

10.0.9.2020.08.20

10.0.9.2020.09.27

FR10.0.6

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fe409fdaed'

${ noResults }

Commit Graph

1562 Commits (fe409fdaed97991681683198fb076ad2d7ca1597)

 

All Branches   

Search

Author	SHA1	Message	Date
Yvan	fe409fdaed	Pull request #1725: 无jira任务 解决冲突 ... Merge in DESIGN/design-i18n from ~YVAN/design-i18n:feature/10.0 to feature/10.0 * commit '337a465932df74e335c7f0b8dc5743e8306ec7f5': REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】迭代提交 【改动思路】迭代提交	4 years ago
Yvan	337a465932	Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0 ... # Conflicts: # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties # design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties # 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
Yvan	d5be6e40ac	无jira任务，处理冲突	4 years ago
superman	ec96600a82	Merge pull request #1723 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit 'b3e523f0c477140574c14c79d074d3cb44a886e3': REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】迭代提交 【改动思路】迭代提交	4 years ago
Yvan	b3e523f0c4	Pull request #1714: REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 ... Merge in DESIGN/design-i18n from ~YVAN/design-i18n:release/10.0 to release/10.0 * commit '484518b6c1dd407fc77bd99d3ac07cac5a527645': REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】迭代提交 【改动思路】迭代提交	4 years ago
Yvan	484518b6c1	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
Yvan	d7e40e351d	REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 ... 【问题原因】迭代提交 【改动思路】迭代提交	4 years ago
superman	4e4ec2eefe	Merge pull request #1703 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit 'a626c3669737dc8333bdf137bcf2ee37ed4b2db7':	4 years ago
superman	a626c36697	Merge pull request #1702 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit 'adf93d82b3045026625ba0b969e14cb8da3cee22':	4 years ago
superman	adf93d82b3	Merge pull request #1701 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit '0a69fcf21740bc1990ccf1de87ee1815c676fea1':	4 years ago
superman	0a69fcf217	Merge pull request #1698 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit 'c562bf97a5eb24c80ef12ba9501ba0242943a100':	4 years ago
superman	c562bf97a5	Merge pull request #1697 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit 'c3743fac6b66b1fe9f7671ca2d2a724ab6a5d9ca': REPORT-26209 chore:国际化crm模板->代码库同步 REPORT-45689 添加国际化 REPORT-42240 【10.0.13】设计器里功能描述（表单、组件）优化 feature->release CHART-17494 修改点地图标记点 REPORT-43744 【10.0.13】插件与jar包不匹配问题优化 CHART-15835 国际化	4 years ago
superman	7c201c8088	Merge pull request #1676 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '65923834332f1b7a39af69815591fa59d8738ddd': CHART-15837 feature→release	4 years ago
superman	6592383433	Merge pull request #1675 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '89053ee2e21aa5b9e04b8343b05960184add140f': CHART-15837 feature→release	4 years ago
Bjorn	89053ee2e2	Pull request #1672: CHART-15837 feature→release ... Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0 * commit 'e1054dae31c6f3535720e4e124222bbd6287e3c9': CHART-15837 feature→release	4 years ago
白岳	e1054dae31	CHART-15837 feature→release	4 years ago
ju|剧浩宇	829a0ca2c9	Pull request #1622: 无jira任务，bugfix合feature，解决冲突 ... Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:feature/10.0 to feature/10.0 * commit 'aa1ad02c15dffe66ff151ecd0e529fc99adfea37': REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
lucian	aa1ad02c15	Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~lucian.chen/design-i18n into feature/10.0 ... Conflicts: design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties 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	9836f8746d	Merge pull request #1620 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '5700fd6206ca1f7bb4c4665001f2dafd71a94290': REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
superman	5700fd6206	Merge pull request #1616 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit 'c3743fac6b66b1fe9f7671ca2d2a724ab6a5d9ca':	4 years ago
superman	c3743fac6b	Merge pull request #1614 in DESIGN/design-i18n from release/10.0 to final/10.0 ... * commit 'e3e93d1de12855fec1e5caec36477cbd3d8dfc8e': REPORT-26209 chore:国际化crm模板->代码库同步 REPORT-45689 添加国际化 REPORT-42240 【10.0.13】设计器里功能描述（表单、组件）优化 feature->release CHART-17494 修改点地图标记点 REPORT-43744 【10.0.13】插件与jar包不匹配问题优化 CHART-15835 国际化	4 years ago
superman	bcfd7c490f	Merge pull request #1612 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit 'c6dd380a59fe45dabfa3021c7bc9fb3f753d8350':	4 years ago
lidongy	e3e93d1de1	Pull request #1610: REPORT-26209 chore:国际化crm模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit '83b589391ec4c453f7c510a57764ef7974a25caa': REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
superman	c6dd380a59	Merge pull request #1611 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit '8d917341a2aaa53263b8dad67baf5bab31b0a971':	4 years ago
lidongy	83b589391e	REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
superman	f80d5d7954	Merge pull request #1603 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '3bec73135ca10c107e6591e93ab6188d3c0646cf':	4 years ago
superman	3bec73135c	Merge pull request #1602 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '7f86582306be7c0c19ade874b93b4e8ff7aff2bd':	4 years ago
superman	7f86582306	Merge pull request #1601 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit '8d917341a2aaa53263b8dad67baf5bab31b0a971':	4 years ago
superman	8d917341a2	Merge pull request #1600 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit '7b65aa103445f2d64cfb46d60f142344064c4d26':	4 years ago
superman	7b65aa1034	Merge pull request #1599 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit '9ed70665efb19c7d52b552988793b7dab791bf51':	4 years ago
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