superman
|
b191a4c69d
|
Merge pull request #916 in BA/design from ~NEIL/design:master to master
* commit '3c0d59b5e406b716f04975bace0cf8860796c81e':
无JIRA任务, 合代码漏了一个.
|
8 years ago |
neil
|
3c0d59b5e4
|
无JIRA任务, 合代码漏了一个.
|
8 years ago |
superman
|
cb417b9f3d
|
Merge pull request #914 in BA/design from ~PAUL/design:master to master
* commit '96ef39063d5e1fd95392a7228cd446c3e5a504fb':
Signed-off-by: unknown <李晓丽>
无JIRA任务, 屏蔽论坛消息 Patch到release.
【国际化修改】修改部分翻译 庄奇 syoki 20170523
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
REPORT-2675 部分国际化key找不到,加载顺序问题
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
去掉之前接口冗余操作
表单支持背景接口
REPORT-2644 master国际化问题
增加限制,不允许添加同分组名的插件
|
8 years ago |
paul
|
96ef39063d
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
superman
|
998828b838
|
Merge pull request #912 in BA/design from ~LILY/design:release to release
* commit 'f5a863610c05f20100e8e4e661d7989b9de483dc':
Signed-off-by: unknown <李晓丽>
|
8 years ago |
unknown
|
f5a863610c
|
Signed-off-by: unknown <李晓丽>
|
8 years ago |
superman
|
d16e56c7af
|
Merge pull request #910 in BA/design from ~NEIL/design:release to release
* commit '105af44f3db48e773f8f1fab9aa8d466f107bb2d':
无JIRA任务, 屏蔽论坛消息 Patch到release.
|
8 years ago |
neil
|
105af44f3d
|
无JIRA任务, 屏蔽论坛消息 Patch到release.
|
8 years ago |
superman
|
ec49402e67
|
Merge pull request #889 in BA/design from ~SYOKI/design:release to release
* commit '883271c3265d8405c6fad907244ec53851497f4a':
【国际化修改】修改部分翻译 庄奇 syoki 20170523
|
8 years ago |
syoki
|
883271c326
|
【国际化修改】修改部分翻译 庄奇 syoki 20170523
|
8 years ago |
superman
|
d06178baf2
|
Merge pull request #888 in BA/design from ~RICHIE/design:release to release
* commit '8b0d6872d98491659721b39a4dce059f969a1e4e':
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
|
8 years ago |
richie
|
8b0d6872d9
|
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
|
8 years ago |
superman
|
9597aa2161
|
Merge pull request #885 in BA/design from ~PLOUGH/design:release to release
* commit 'ab36e7b5bb9a054f5cae40c377dfca513c061470':
REPORT-2675 部分国际化key找不到,加载顺序问题
|
8 years ago |
plough
|
ab36e7b5bb
|
REPORT-2675 部分国际化key找不到,加载顺序问题
|
8 years ago |
superman
|
e3aacd2a5d
|
Merge pull request #882 in BA/design from ~PLOUGH/design:master to master
* commit '5bedbdc937cbf2b673c4e4c9f571eef6795eb0bb':
国际化,同步
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
superman
|
6f651d744e
|
Merge pull request #881 in BA/design from ~PLOUGH/design:release to release
* commit 'd686f00e6f753efb602d2ff6eaae2b86b722224c':
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
plough
|
5bedbdc937
|
国际化,同步
|
8 years ago |
plough
|
d686f00e6f
|
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
plough
|
ccf9f6ea32
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~plough/design
|
8 years ago |
plough
|
ef0f5f8a13
|
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
superman
|
b070501e4e
|
Merge pull request #879 in BA/design from ~NEIL/design:master to master
* commit 'f0fcb3fc95becbcaa447aaf0e15a3940e8d50970':
1
无JIRA任务, 合代码漏了个NPE
|
8 years ago |
neil
|
f0fcb3fc95
|
1
|
8 years ago |
neil
|
d9f7bf50f4
|
无JIRA任务, 合代码漏了个NPE
|
8 years ago |
superman
|
1e55080808
|
Merge pull request #870 in BA/design from ~PLOUGH/design:release to release
* commit '77ccca677c51611cd7d4c769ec94103e8f3a5733':
REPORT-2644 master国际化问题
|
8 years ago |
plough
|
77ccca677c
|
merge
|
8 years ago |
superman
|
b75425f52a
|
Merge pull request #871 in BA/design from ~HUGH/design:release to release
* commit 'cc4994a9eb6feea66425bd927d98322045ac9a58':
去掉之前接口冗余操作
表单支持背景接口
增加限制,不允许添加同分组名的插件
|
8 years ago |
superman
|
8519363d7d
|
Merge pull request #869 in BA/design from ~PLOUGH/design:master to master
* commit 'e10fbeb70d1bb10ad8c87c104d58c45805c4ed37':
无JIRA任务,国际化
REPORT-2644 master国际化问题
|
8 years ago |
superman
|
dbdbeadae7
|
Merge pull request #872 in BA/design from ~SYOKI/design:release to release
* commit 'a1a46908205ad1eadadcad95e67eb650330a3a1e':
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
8 years ago |
syoki
|
a1a4690820
|
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
8 years ago |
hugh
|
cc4994a9eb
|
去掉之前接口冗余操作
|
8 years ago |
hugh
|
abc43081b6
|
表单支持背景接口
|
8 years ago |
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 |
plough
|
e10fbeb70d
|
无JIRA任务,国际化
|
8 years ago |
plough
|
592ecab810
|
REPORT-2644 master国际化问题
|
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 |
superman
|
ee78c63f92
|
Merge pull request #865 in BA/design from ~PLOUGH/design:release to release
* commit 'bc4c93cdd666feaeae36ef64a4f654642b908557':
国际化
无JIRA任务,国际化翻译更新
无JIRA任务,国际化翻译更新
|
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
|
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 |