Tree: 2eb7aa8578

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 '2eb7aa8578'

${ noResults }

Commit Graph

1448 Commits (2eb7aa8578cfb9a1cff5a51b9a0da48df270655b)

 

All Branches   

Search

Author	SHA1	Message	Date
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
lidongy	70c21ef800	REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
lidongy	8ccbd06d31	调整	4 years ago
superman	726c8560f6	Merge pull request #1261 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '1e050ac339da74c052621ac7f0ef55a8424ccd1f':	4 years ago
superman	1e050ac339	Merge pull request #1260 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '66301d580c55179da3391703d8f684607ccc6e72':	4 years ago
superman	66301d580c	Merge pull request #1259 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit 'd1d229be8e5e5fde9c86ddb62f820f5053d83eb6':	4 years ago
superman	d1d229be8e	Merge pull request #1258 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit 'ba364c4fe1e6abf96d3348036f1e3738ddadf2a1':	4 years ago
superman	ba364c4fe1	Merge pull request #1257 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit 'ef3b6c3e60ebb813e255dfe9c7e3b731f8dc00d1':	4 years ago
superman	82a95b6c6e	Merge pull request #1205 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '0c0c50bbdc03eba3d41839d77a2e2291ab854f21': REPORT-35149 增加国际化key	4 years ago
superman	0c0c50bbdc	Merge pull request #1204 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '2a3c14a37bde8192c79871a8928ec34a40a782c7': REPORT-35149 增加国际化key	4 years ago
kerry	2a3c14a37b	Pull request #1196: REPORT-35149 增加国际化key ... Merge in DESIGN/design-i18n from ~KERRY/design-i18n:release/10.0 to release/10.0 * commit '041db5442e68dd04837739a87ddcf786a7eb06d4': REPORT-35149 增加国际化key	4 years ago
superman	d469aecfb3	Merge pull request #1200 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '0aa38f68750b5e9ad9c25bff1b8384b37668638e':	4 years ago
superman	0aa38f6875	Merge pull request #1199 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '3192e7ed55462bab7c23758c784d31136e361c9f':	4 years ago
kerry	041db5442e	REPORT-35149 增加国际化key	4 years ago
superman	3192e7ed55	Merge pull request #1195 in DESIGN/design-i18n from bugfix/10.0 to release/10.0 ... * commit '03ce10412a30a680f257c40f1d5e858be75deac1':	4 years ago
ju.ju	0c12a0b226	Pull request #1178: 无jira 解决冲突 ... Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0 * commit '146515f46b3ca0bfeec36ea99a9390516ac2a2a6': 修改 REPORT-35149 预定义样式功能feature合到release	4 years ago
hades	146515f46b	无jira 解决冲突	4 years ago
superman	03ce10412a	Merge pull request #1176 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit 'b55176a4068b04567cd9da40add0cfa8e728d0ba': 修改 REPORT-35149 预定义样式功能feature合到release	4 years ago
kerry	b55176a406	Pull request #1173: REPORT-35149 预定义样式功能feature合到release ... Merge in DESIGN/design-i18n from ~KERRY/design-i18n:release/10.0 to release/10.0 * commit '6cb20ba768186cf6dcf1d3745bb543d9bf8cbb0b': 修改 REPORT-35149 预定义样式功能feature合到release	4 years ago
kerry	6cb20ba768	修改	4 years ago
kerry	552e0b09c9	REPORT-35149 预定义样式功能feature合到release	4 years ago
superman	122197019a	Merge pull request #1171 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit 'c1a3daa484bf7a665918c86e1e3f5a6695f96fae':	4 years ago
superman	c1a3daa484	Merge pull request #1170 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit 'a1ff334a8ba3032d1e426cd953fae5836f3ded7c':	4 years ago
superman	a1ff334a8b	Merge pull request #1169 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit 'ef3b6c3e60ebb813e255dfe9c7e3b731f8dc00d1':	4 years ago
superman	ef3b6c3e60	Merge pull request #1168 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit '0af4d12cd6d29107c36766e4b8dbc136985f8158':	4 years ago
superman	0af4d12cd6	Merge pull request #1164 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit 'e88c0d71fbfc2680fe09b307e4d46fe7f51c2f1f':	4 years ago
Hades	f21c6a89ae	Pull request #1160: 无jira 解决冲突 ... Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0 * commit '0d341d52ebec0e0615b3159f49344670db5e222f': REPORT-40646 远程设计对接平台密码策略 国际化	4 years ago
hades	0d341d52eb	无jira 解决冲突	4 years ago
superman	9d02c89074	Merge pull request #1157 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit 'c6204d7c4ec620235b9435ca80fa4656b5f98e3f': REPORT-40646 远程设计对接平台密码策略 国际化	4 years ago
Hades	c6204d7c4e	Pull request #1147: REPORT-40646 远程设计对接平台密码策略 国际化 ... Merge in DESIGN/design-i18n from ~HADES/design-i18n:release/10.0 to release/10.0 * commit '3546624b8dc142d3d40914f6bbb5f6118a2da792': REPORT-40646 远程设计对接平台密码策略 国际化	4 years ago
superman	3f91298768	Merge pull request #1153 in DESIGN/design-i18n from bugfix/10.0 to feature/10.0 ... * commit '95459aa7e3c9e3d633c9b3619fd61d34fec51e55': REPORT-26209 chore:国际化crm模板->代码库同步 CHART-15902 分类轴标签显示方式界面	4 years ago
superman	95459aa7e3	Merge pull request #1152 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '7f776f25eef0ca6e822221e2b44bb09a7787d254': REPORT-26209 chore:国际化crm模板->代码库同步 CHART-15902 分类轴标签显示方式界面	4 years ago
superman	7f776f25ee	Merge pull request #1151 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit 'e88c0d71fbfc2680fe09b307e4d46fe7f51c2f1f':	4 years ago
superman	e88c0d71fb	Merge pull request #1150 in DESIGN/design-i18n from persist/10.0 to final/10.0 ... * commit '91c6dc45d4ab3a8412f7e9f159e9edb75657a759':	4 years ago
lidongy	39aea41712	Pull request #1148: REPORT-26209 chore:国际化crm模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'c808a5d3b4f0d37e844cafaf06576fa430a52cf4': REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
superman	91c6dc45d4	Merge pull request #1149 in DESIGN/design-i18n from final/10.0 to persist/10.0 ... * commit 'ff6e1d70d203e6956493a9003a4346eec8c2aa00':	4 years ago
lidongy	c808a5d3b4	Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~lidongy/design-i18n into release/10.0	4 years ago
lidongy	22f2a2182f	REPORT-26209 chore:国际化crm模板->代码库同步	4 years ago
Qinghui.Liu	b8b47a8775	Pull request #1146: CHART-15902 分类轴标签显示方式界面 ... Merge in DESIGN/design-i18n from ~QINGHUI.LIU/design-i18n:release/10.0 to release/10.0 * commit 'd3c5aa88f24b7c0bb2b652e98c1dff19a12ea489': CHART-15902 分类轴标签显示方式界面	4 years ago
hades	3546624b8d	REPORT-40646 远程设计对接平台密码策略 国际化	4 years ago
Qinghui.Liu	d3c5aa88f2	Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design-i18n into release/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	4 years ago