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
|
225ec2de75
|
Merge pull request #913 in BA/design from ~NEIL/design:dev to dev
* commit '59180e23e36ffbfd7978d686b2d31678f66d0f7e':
无JIRA任务， 国际化合并
|
8 years ago |
neil
|
59180e23e3
|
无JIRA任务， 国际化合并
|
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
|
599423bc16
|
Merge pull request #909 in BA/design from ~HZZZ/design:fix-REPORT-2811 to dev
* commit 'd618b70f1e6a31a2906851af70a3c903bba6eb0d':
fix
use UIPopupMenu
PMD
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
8 years ago |
hzzz
|
d618b70f1e
|
fix
|
8 years ago |
|
hzzz
|
b8fbd2ecc0
|
use UIPopupMenu
|
8 years ago |
|
hzzz
|
9d84491d12
|
PMD
|
8 years ago |
|
hzzz
|
f8932e2f28
|
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
8 years ago |
|
superman
|
dcf9a44b08
|
Merge pull request #907 in BA/design from ~HZZZ/design:reset-before-2773 to dev
* commit '5b17a17e85a5fdc382644ee7663bd1863cb379e0':
back 2
back 1
|
8 years ago |
|
hzzz
|
5b17a17e85
|
back 2
|
8 years ago |
|
hzzz
|
71b44df358
|
back 1
|
8 years ago |
|
superman
|
fd1d2d76b4
|
Merge pull request #906 in BA/design from ~MANGO/design:dev to dev
* commit 'de88676473718e3791828128c4fc2bd141267485':
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
8 years ago |
mengao
|
de88676473
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
|
mengao
|
8d64d45fc3
|
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
8 years ago |
|
superman
|
d30d8bfc7b
|
Merge pull request #903 in BA/design from ~HZZZ/design:fix-REPORT-2773 to dev
* commit 'ac5976346ac2ce30299cf629d062c78ed029e458':
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
superman
|
68bbb0927c
|
Merge pull request #904 in BA/design from ~NEIL/design:dev to dev
* commit '8555ab940f5325cb63cd5c0f8d11f57fec2ea364':
无JIRA任务， build failed
|
8 years ago |
|
neil
|
8555ab940f
|
无JIRA任务， build failed
|
8 years ago |
|
hzzz
|
ac5976346a
|
PMD
|
8 years ago |
|
hzzz
|
e784491bdd
|
PMD
|
8 years ago |
|
hzzz
|
d35287a513
|
PMD
|
8 years ago |
|
hzzz
|
500b837aaf
|
PMD
|
8 years ago |
|
hzzz
|
3cf5553cd3
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
dca652ba71
|
PMD
|
8 years ago |
|
hzzz
|
408120739f
|
PMD
|
8 years ago |
|
hzzz
|
e4d9c6b230
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
84ea260e17
|
Merge branch 'dev' into fix-REPORT-2773
|
8 years ago |
|
hzzz
|
419dfc1423
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
superman
|
d63d1340b7
|
Merge pull request #902 in BA/design from ~NEIL/design:dev to dev
* commit '277e0bfb48379930ee0e88f2c7cd633ad98b9a36':
REPORT-2801 关掉设计器获取论坛消息.
|
8 years ago |
|
neil
|
277e0bfb48
|
REPORT-2801 关掉设计器获取论坛消息.
|
8 years ago |
|
superman
|
7545beb714
|
Merge pull request #897 in BA/design from ~HZZZ/design:fix-REPORT-2773 to dev
* commit '76434782badb619bd60c30501f5e2d013173b92e':
PMD
局部变量不行..还是改回去吧
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
fix
修logPane的快捷键
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
76434782ba
|
PMD
|
8 years ago |
|
hzzz
|
9208424807
|
局部变量不行..还是改回去吧
|
8 years ago |
|
hzzz
|
411da370e4
|
PMD
|
8 years ago |
|
hzzz
|
ae2dff9a14
|
resolve conflict
|
8 years ago |
|
hzzz
|
844a9a8669
|
PMD
|
8 years ago |
|
superman
|
073c3489f0
|
Merge pull request #900 in BA/design from ~NEIL/design:dev to dev
* commit '8a4830d5e2f8144f4b557b6177390defaa177b2b':
1
1
无JIRA任务，国际化冲突修正.
|
8 years ago |
|
superman
|
77bf463196
|
Merge pull request #898 in BA/design from ~NEIL/design:release to dev
* commit '7ea56cd1bca7da405181a56be4f8a33343ebc10c': (22 commits)
ct
【国际化修改】修改部分翻译 庄奇 syoki 20170523
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
REPORT-2675 部分国际化key找不到，加载顺序问题
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
去掉之前接口冗余操作
表单支持背景接口
REPORT-2644 master国际化问题
国际化
无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
...
|
8 years ago |
|
neil
|
8a4830d5e2
|
1
|
8 years ago |
|
neil
|
e2860f3a0a
|
1
|
8 years ago |
|
neil
|
917a793904
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
8 years ago |
|
neil
|
d0b30454fc
|
无JIRA任务，国际化冲突修正.
|
8 years ago |
|
superman
|
a92564857a
|
Merge pull request #899 in BA/design from ~EASON/design:dev to dev
* commit '11be0591cb560dec064642f5d744a158a0df5473':
删除不用的设计器代码
|
8 years ago |
eason-skx
|
11be0591cb
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~eason/design into dev
|
8 years ago |
|
eason-skx
|
c8c861600d
|
删除不用的设计器代码
|
8 years ago |
|
neil
|
7ea56cd1bc
|
ct
|
8 years ago |
|
hzzz
|
7e2f1a851d
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
