Tree: 47a31e4f3d

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 '47a31e4f3d'

${ noResults }

Commit Graph

1309 Commits (47a31e4f3d9133c2b95c41a2a2ffcb96a2f22fb1)

 

All Branches   

Search

Author	SHA1	Message	Date
superman	b73468706e	Merge pull request #510 in DESIGN/design-i18n from release/10.0 to feature/10.0 ... * commit '6d6f7263ba8c576dac914eac5c1784343bcf2196':	4 years ago
superman	06f3959ab7	Merge pull request #509 in DESIGN/design-i18n from release/10.0 to bugfix/10.0 ... * commit '6d6f7263ba8c576dac914eac5c1784343bcf2196':	4 years ago
superman	6d6f7263ba	Merge pull request #508 in DESIGN/design-i18n from final/10.0 to release/10.0 ... * commit 'ba5fa181c004152b03a36d24d5fe53e78d85f22f':	4 years ago
Kara	ba5fa181c0	Pull request #504: 无jira任务， release/10.0 合 final/10.0 ... Merge in DESIGN/design-i18n from release/10.0 to final/10.0 * commit '80402c95f393bb1ac4ceea27279992905d7e3dec': REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 调整 解决冲突 REPORT-26209 国际化CRM模板->代码库同步 REPORT-33236 REPORT-33236 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 REPORT-26209 国际化CRM模板->代码库同步	4 years ago
ju.ju	870d3e8b77	Pull request #501: 无jira任务， release/10.0 合 bugfix/10.0 ... Merge in DESIGN/design-i18n from release/10.0 to bugfix/10.0 * commit '80402c95f393bb1ac4ceea27279992905d7e3dec': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
superman	13fcb5f87f	Merge pull request #502 in DESIGN/design-i18n from release/10.0 to feature/10.0 ... * commit '80402c95f393bb1ac4ceea27279992905d7e3dec': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	80402c95f3	Pull request #498: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'e723481f32fd3f5c853b3ea49b3a2a0d953f26d8': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	e723481f32	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
ju.ju	5d1d381785	Pull request #497: 无jira任务， release/10.0 合 feature/10.0 ... Merge in DESIGN/design-i18n from release/10.0 to feature/10.0 * commit '55cc364da439b77b4af41e65c818a73c08b99c4f': (274 commits) REPORT-26209 国际化CRM模板->代码库同步 调整 解决冲突 REPORT-26209 国际化CRM模板->代码库同步 REPORT-33236 REPORT-33236 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 MOBILE-27532 单选／复选按钮组自适应高度 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-14191 国际化 CHART-14182 新增国际化key ...	4 years ago
ju.ju	52d8669bb0	Pull request #496: REPORT-26209 release->bugfix ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:bugfix/10.0 to bugfix/10.0 * commit 'fc5326a1208432c187609f0fde31286775f0754c': (237 commits) REPORT-26209 国际化CRM模板->代码库同步 调整 解决冲突 REPORT-26209 国际化CRM模板->代码库同步 REPORT-33236 REPORT-33236 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 MOBILE-27532 单选／复选按钮组自适应高度 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-14191 国际化 CHART-14182 新增国际化key ...	4 years ago
lidongy	fc5326a120	Merge branch 'release/10.0' of https://code.fineres.com/scm/~lidongy/design-i18n into bugfix/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
lidongy	55cc364da4	Pull request #495: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'd7fd0bcb0003d60a5ade2ad89f2de132386d0be8': REPORT-26209 国际化CRM模板->代码库同步 调整 解决冲突	4 years ago
lidongy	d7fd0bcb00	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	a874aaad10	调整	4 years ago
lidongy	5743a19f62	解决冲突	4 years ago
Harrison	84ce290fba	Pull request #493: 无jira任务，final 合并 release， 解决冲突 ... Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:release/10.0 to release/10.0 * commit 'dca8945a73e7b0dbebd8b18144b339a5d7e5b5e0': MOBILE-27220 表单移动端属性加一个“默认”和“自定义样式”开关 REPORT-32251 翻译补充 REPORT-32251 bugfix->release 未合国际化 手动提交下 REPORT-29503【国际化】导出Excel按钮，设计器内翻译与工具栏翻译不一致 无JIRA任务，release10 -> 10 无JIRA任务， release/10.0 - > 10.0 REPORT-11752 国际化问题 REPORT-11789 自定义按钮名字被改了 REPORT-11692 alphafine分词查询结果中包含了连词结果	4 years ago
lucian	dca8945a73	Merge branch 'final/10.0' of https://code.fineres.com/scm/~lucian.chen/design-i18n into release/10.0 ... Conflicts: design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties	4 years ago
Kara	ac7debda0d	Pull request #491: 无jira任务， persist/10.0 合 final/10.0 ... Merge in DESIGN/design-i18n from persist/10.0 to final/10.0 * commit '18ab0511996802070ea1c5a081b70f79f63c4b2a': 无JIRA任务，release10 -> 10 无JIRA任务， release/10.0 - > 10.0 REPORT-11752 国际化问题 REPORT-11789 自定义按钮名字被改了 REPORT-11692 alphafine分词查询结果中包含了连词结果	4 years ago
lidongy	43ad8d9aae	Pull request #489: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'fa66d4462bde1abcf753e0f201455d6c47c97cd8': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Jimmy.Zheng	442ddab7e2	Pull request #488: REPORT-33236 迭代任务 ... Merge in DESIGN/design-i18n from ~JIMMY.ZHENG/design-i18n:release/10.0 to release/10.0 * commit '0a2391af3777b1158a312d46fb35d5d54dacb249': REPORT-33236 REPORT-33236	4 years ago
lidongy	fa66d4462b	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Jimmy.Zheng	0a2391af37	REPORT-33236	4 years ago
Jimmy.Zheng	c3d6cdad74	REPORT-33236	4 years ago
lidongy	f71ab3ce6d	Pull request #487: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'd2e89fe4117b1fd76dc0c20b24a5f28336ae7b4d': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	d2e89fe411	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	7928deab72	Pull request #486: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'a5ce8ab61ad29acd7d28a9afd7c320d4fd6cb872': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	a5ce8ab61a	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	516398930a	Pull request #485: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit '9d01ea1b3fdc372115578e28fc09a67811da5845': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	9d01ea1b3f	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Kara	18ab051199	Pull request #484: Persist/10.0 ... Merge in DESIGN/design-i18n from ~JEO/design-i18n:persist/10.0 to persist/10.0 * commit 'bc5bc09553f4c594126d717ca6662af25ff40597': (94 commits) REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 MOBILE-27532 单选／复选按钮组自适应高度 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-14191 国际化 CHART-14182 新增国际化key REPORT-26209 国际化CRM模板->代码库同步 CHART-11710 国际化 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 无JIRA任务 gradle配置修改 无JIRA任务 gradle配置修改 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化crm模板->代码库同步 命名规范 MOBILE-27220 表单移动端属性加一个“默认”和“自定义样式”开关 REPORT-26209 国际化crm模板->代码库同步 REPORT-32251 翻译补充 ...	4 years ago
jeo	bc5bc09553	Merge branch 'final/10.0' into persist/10.0	4 years ago
lidongy	1efb878725	Pull request #483: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'd53b0e693e69b4d9efb33228b61c10e54906f14a': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	d53b0e693e	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Bjorn	909241d3f0	Pull request #482: CHART-13666 国际化 ... Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0 * commit '177ed00757ee005871b86112fefbc2f4964b80f7': CHART-13666 国际化	4 years ago
白岳	177ed00757	CHART-13666 国际化	4 years ago
lidongy	b712b1e7d6	Pull request #481: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit '53d4a15aca9903f45b0b883061622a0e4aefd445': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	53d4a15aca	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Kara	31d92c047f	Pull request #480: Final/10.0 ... Merge in DESIGN/design-i18n from ~JEO/design-i18n:final/10.0 to final/10.0 * commit 'c87d88e41663f4b9c6d9e271276d483bd8ad4102': (94 commits) REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 MOBILE-27532 单选／复选按钮组自适应高度 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步 CHART-14191 国际化 CHART-14182 新增国际化key REPORT-26209 国际化CRM模板->代码库同步 CHART-11710 国际化 REPORT-26209 国际化CRM模板->代码库同步 CHART-13666 国际化 无JIRA任务 gradle配置修改 无JIRA任务 gradle配置修改 REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化crm模板->代码库同步 命名规范 MOBILE-27220 表单移动端属性加一个“默认”和“自定义样式”开关 REPORT-26209 国际化crm模板->代码库同步 REPORT-32251 翻译补充 ...	4 years ago
jeo	c87d88e416	Merge branch 'release/10.0' into final/10.0 ... # Conflicts: # design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties	4 years ago
lidongy	2bab5a5d0a	Pull request #479: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit '9b017bb5fdf081c1e2fe1dc2a10987aaffbaf82b': REPORT-26209 国际化CRM模板->代码库同步 REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	9b017bb5fd	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	220a3f3c9a	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
Bjorn	a813cf5dfa	Pull request #478: CHART-13666 国际化 ... Merge in DESIGN/design-i18n from ~BJORN/design-i18n:release/10.0 to release/10.0 * commit '905ee40e0cdcfe0413c35a86620bcd93a67047b2': CHART-13666 国际化	4 years ago
wei	0dbe7a592d	Pull request #477: MOBILE-27532 单选／复选按钮组自适应高度 ... Merge in DESIGN/design-i18n from ~DREW/design-i18n:release/10.0 to release/10.0 * commit 'c7b00c0f27626468849814086d604480df6aad03': MOBILE-27532 单选／复选按钮组自适应高度	4 years ago
白岳	905ee40e0c	CHART-13666 国际化	4 years ago
nmwei	c7b00c0f27	Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~drew/design-i18n into release/10.0	4 years ago
nmwei	d9e6c81982	MOBILE-27532 单选／复选按钮组自适应高度	4 years ago
lidongy	89d4fb7e11	Pull request #476: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit '57e65b89d57f44df1e25757cea89a19955be5d5c': REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	57e65b89d5	REPORT-26209 国际化CRM模板->代码库同步	4 years ago
lidongy	001f85d6b0	Pull request #475: REPORT-26209 国际化CRM模板->代码库同步 ... Merge in DESIGN/design-i18n from ~LIDONGY/design-i18n:release/10.0 to release/10.0 * commit 'ccaf44337922f9ae81872019e44f14a1a7aa98c9': REPORT-26209 国际化CRM模板->代码库同步	5 years ago