hugh
|
3688b4f903
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit 'ee78c63f92afe56ea6112748becef733305a637b': (343 commits)
国际化
无JIRA任务，国际化翻译更新
无JIRA任务，国际化翻译更新
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
Signed-off-by: unknown <李晓丽>
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
REPORT-2483 & REPORT-2484 国际化key转移；外文版的国际化文件和中文版不一致
无JIRA任务 新release合并遗漏
无任务，line separator
REPORT-2537
无任务，冲突调整，release到dev
无JIRA任务，国际化，把release、master中的key合并到dev中
无JIRA任务，解决冲突
ct
ct
ct
ct
1
...
|
8 years ago |
plough
|
f66f6b7fa6
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
8 years ago |
|
plough
|
fe74e83e73
|
REPORT-2644 master国际化问题
|
8 years ago |
xiaoxia
|
c473346c92
|
rt
|
8 years ago |
|
plough
|
e10fbeb70d
|
无JIRA任务，国际化
|
8 years ago |
|
plough
|
592ecab810
|
REPORT-2644 master国际化问题
|
8 years ago |
mengao
|
316e203c8e
|
去掉不需要的方法，不需要的面板返回null。
|
8 years ago |
|
xiaoxia
|
2475c5e553
|
rt
|
8 years ago |
|
xiaoxia
|
200bedcc9a
|
rt
|
8 years ago |
|
xiaoxia
|
49b96edf8e
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
8 years ago |
|
xiaoxia
|
5c61c160c4
|
rt
|
8 years ago |
superman
|
3e6a18c78d
|
Merge pull request #867 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit '3c3145251f1636619604179938776ef6a38893a0':
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
alphafine 1
|
8 years ago |
|
xiaoxia
|
3c3145251f
|
rt
|
8 years ago |
|
xiaoxia
|
3955ce43a4
|
rt
|
8 years ago |
|
xiaoxia
|
ceb27fbad1
|
rt
|
8 years ago |
|
xiaoxia
|
6fc4115978
|
rt
|
8 years ago |
|
xiaoxia
|
bdbf6a8d10
|
rt
|
8 years ago |
|
xiaoxia
|
3669c44197
|
rt
|
8 years ago |
|
xiaoxia
|
2b7c7239ca
|
rt
|
8 years ago |
|
xiaoxia
|
f126c0ed85
|
rt
|
8 years ago |
|
xiaoxia
|
3f9f7239e7
|
rt
|
8 years ago |
|
xiaoxia
|
c881e2488e
|
rt
|
8 years ago |
|
xiaoxia
|
96662a2a73
|
rt
|
8 years ago |
|
xiaoxia
|
3b42f73737
|
rt
|
8 years ago |
|
mengao
|
2c523e1088
|
接口代码优化
|
8 years ago |
|
xiaoxia
|
9fad179103
|
rt
|
8 years ago |
|
xiaoxia
|
46d31e9601
|
alphafine 1
|
8 years ago |
|
mengao
|
62883951ce
|
优化代码
|
8 years ago |
|
superman
|
099b4ec3ba
|
Merge pull request #866 in BA/design from ~PAUL/design:master to master
* commit 'ee78c63f92afe56ea6112748becef733305a637b': (72 commits)
国际化
无JIRA任务，国际化翻译更新
无JIRA任务，国际化翻译更新
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
Signed-off-by: unknown <李晓丽>
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
REPORT-2483 & REPORT-2484 国际化key转移；外文版的国际化文件和中文版不一致
无JIRA任务 新release合并遗漏
无任务，line separator
REPORT-2537
无任务，冲突调整，release到dev
无JIRA任务，国际化，把release、master中的key合并到dev中
无JIRA任务，解决冲突
ct
ct
ct
ct
1
...
|
8 years ago |
|
mengao
|
d2bd8c424e
|
优化代码
|
8 years ago |
|
mengao
|
fb6e8823a4
|
优化接口设计代码
|
8 years ago |
|
superman
|
ee78c63f92
|
Merge pull request #865 in BA/design from ~PLOUGH/design:release to release
* commit 'bc4c93cdd666feaeae36ef64a4f654642b908557':
国际化
无JIRA任务，国际化翻译更新
无JIRA任务，国际化翻译更新
|
8 years ago |
|
mengao
|
7602e92a1f
|
优化接口设计代码
|
8 years ago |
|
plough
|
bc4c93cdd6
|
国际化
|
8 years ago |
|
plough
|
b98d554a41
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
8 years ago |
|
plough
|
19934d8f12
|
无JIRA任务，国际化翻译更新
|
8 years ago |
|
plough
|
e51da95007
|
无JIRA任务，国际化翻译更新
|
8 years ago |
|
superman
|
87a2952e64
|
Merge pull request #862 in BA/design from ~LILY/design:release to release
* commit 'ce71b0ea0dce16214aff2e347588bd988a9ddb0b':
Signed-off-by: unknown <李晓丽>
|
8 years ago |
|
superman
|
32667bbdd5
|
Merge pull request #864 in BA/design from ~PLOUGH/design:release to release
* commit '7e78f2cff896043767bc2ea33499f7315f79034d':
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
|
8 years ago |
|
plough
|
7e78f2cff8
|
REPORT-2626 移除国际化文件中的无效key
|
8 years ago |
|
plough
|
d60a80e98e
|
REPORT-2626 移除国际化文件中的无效key
|
8 years ago |
|
superman
|
7c05e158f4
|
Merge pull request #863 in BA/design from ~SYOKI/design:release to release
* commit '4aef54dbd72b742031360cedb15ecd9c92b02918':
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
|
8 years ago |
syoki
|
4aef54dbd7
|
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
|
8 years ago |
unknown
|
ce71b0ea0d
|
Signed-off-by: unknown <李晓丽>
|
8 years ago |
|
superman
|
1f72d549e9
|
Merge pull request #861 in BA/design from ~HZZZ/design:fix-REPORT-2600 to dev
* commit '8b8e30196ba1b8e8a7381db9b1b1d694fdef27c0':
remove unused code
fix
|
8 years ago |
hzzz
|
8b8e30196b
|
remove unused code
|
8 years ago |
|
hzzz
|
542d6f9980
|
fix
|
8 years ago |
|
superman
|
877b0d77d7
|
Merge pull request #859 in BA/design from ~HZZZ/design:fix-REPORT-2600 to dev
* commit '999d5e2b52be7cd07b0597aa607cd0c431183b99':
fix
fix
..
fix PMD
fix REPORT-2600
|
8 years ago |
|
hzzz
|
999d5e2b52
|
fix
|
8 years ago |
|
superman
|
9d59d65b2c
|
Merge pull request #860 in BA/design from ~SYOKI/design:release to release
* commit '5a1c073c5adbb71830928ba49fa780c25602d987':
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
|
8 years ago |
