yaoh.wu
|
4463b41c7f
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '631f906114ef3dced6cd1894a98bc7327c6d23dd': (106 commits)
补上句号
国际化少了句号
无JIRA任务 tab布局字体、字号无法修改,release同步到dev
修改国际化文件
修改国际化冲突
修正“移动端属性”菜单中“解析方式”中的注释分别在报表和表单中有争取的表现
插件状态
登录界面接口重新设计,避免使用请求注入的方式
无JIRA任务, 修复冲突
ct
ct
其他兼容
report-1343 ftp上传漏提交
修改命名
修改一个命名
修正一个函数命名
去掉一个注释
修改一个小错误,WLayout->WSortLayout
无JIRA任务, designer打包用1.7
调整代码
...
|
8 years ago |
fr_shine
|
b388a85042
|
editlabel not append origin label
|
8 years ago |
superman
|
631f906114
|
Merge pull request #736 in BA/design from ~FANGLEI/design:dev to dev
* commit '04bba80e9f190fc6e22ad6d94abc8939aed5caa0':
补上句号
国际化少了句号
|
8 years ago |
superman
|
85be08aafa
|
Merge pull request #737 in BA/design from ~FANGLEI/design:release to release
* commit '804f703e9603798a8157e040c9e5d7a3aeef560a':
增加一个句号
|
8 years ago |
fanglei
|
804f703e96
|
增加一个句号
|
8 years ago |
fanglei
|
04bba80e9f
|
补上句号
|
8 years ago |
fanglei
|
a6790be03c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
d191a63036
|
国际化少了句号
|
8 years ago |
superman
|
c20b13fd30
|
Merge pull request #735 in BA/design from ~ZHOUPING/design:dev to dev
* commit '63fcbae2af6152e463e7655c7ae5d878e0b4b30e':
无JIRA任务 tab布局字体、字号无法修改,release同步到dev
|
8 years ago |
zhouping
|
63fcbae2af
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev
|
8 years ago |
zhouping
|
7d077a4653
|
无JIRA任务 tab布局字体、字号无法修改,release同步到dev
|
8 years ago |
superman
|
40f2be22f6
|
Merge pull request #734 in BA/design from ~ZHOUPING/design:release to release
* commit '2b782756f439d17cd26ae4caecf20658caa4b3e1':
REPORT-2021 tab布局字体、字号无法修改
|
8 years ago |
zhouping
|
2b782756f4
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release
|
8 years ago |
zhouping
|
dd44bda245
|
REPORT-2021 tab布局字体、字号无法修改
|
8 years ago |
superman
|
d1eef6836a
|
Merge pull request #733 in BA/design from ~FANGLEI/design:release to release
* commit '0084eb4e7f39a70199aa73b3f46705e6a6c56ad7':
同步国际化
|
8 years ago |
superman
|
34c9807ec9
|
Merge pull request #731 in BA/design from ~FANGLEI/design:dev to dev
* commit '7e7c6f9983f04d9547e7af2ab3a15aff38c2e0a7':
修改国际化文件
修改国际化冲突
修正“移动端属性”菜单中“解析方式”中的注释分别在报表和表单中有争取的表现
|
8 years ago |
fanglei
|
0084eb4e7f
|
同步国际化
|
8 years ago |
fanglei
|
7e7c6f9983
|
修改国际化文件
|
8 years ago |
superman
|
c943d01011
|
Merge pull request #732 in BA/design from ~FANGLEI/design:release to release
* commit 'ccddb53ac074fa977e95abb488defe8ce0fb3799':
同步在release中的国际化修改
|
8 years ago |
fanglei
|
ccddb53ac0
|
同步在release中的国际化修改
|
8 years ago |
fanglei
|
8abb491cb4
|
修改国际化冲突
|
8 years ago |
fanglei
|
370b834f68
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
8 years ago |
fanglei
|
92d9e6fddc
|
修正“移动端属性”菜单中“解析方式”中的注释分别在报表和表单中有争取的表现
|
8 years ago |
superman
|
bdf3ff1598
|
Merge pull request #730 in BA/design from ~JU/1-ba-design:dev to dev
* commit '3b6b8e7655e3623b32db5a00b1de879f4640f490':
插件状态
|
8 years ago |
superman
|
0478aa7987
|
Merge pull request #728 in BA/design from ~RICHIE/design:dev to dev
* commit '9c45d4505328b4fa5eeb950e9a8ed3a0ddaf92d8':
登录界面接口重新设计,避免使用请求注入的方式
|
8 years ago |
superman
|
a4c8a7efd3
|
Merge pull request #729 in BA/design from ~ZHOUPING/design:9.0 to 9.0
* commit 'c604d42924f37ace7cde463b8c058c2647ff345c':
REPORT-891 表单打开时即显示缩略图
REPORT-891 表单打开时即显示缩略图
|
8 years ago |
zhouping
|
c604d42924
|
REPORT-891 表单打开时即显示缩略图
|
8 years ago |
juhaoyu
|
3b6b8e7655
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
zhouping
|
7a848c91dd
|
REPORT-891 表单打开时即显示缩略图
|
8 years ago |
juhaoyu
|
61ce070f0e
|
插件状态
|
8 years ago |
richie
|
9c45d45053
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
richie
|
c79c47b393
|
登录界面接口重新设计,避免使用请求注入的方式
|
8 years ago |
superman
|
5eb57808c1
|
Merge pull request #727 in BA/design from ~NEIL/design:dev to dev
* commit 'ff38b20cab6818c8563d2c721eccf6e28959c0c0':
无JIRA任务, 修复冲突
|
8 years ago |
neil
|
ff38b20cab
|
无JIRA任务, 修复冲突
|
8 years ago |
superman
|
ce36df9dba
|
Merge pull request #726 in BA/design from ~NEIL/design:master to dev
* commit '0ebe0c91847de19db1183f69f78b2efd8bc3a853': (74 commits)
ct
ct
REPORT-1967 国际化
REPORT-1940 表单从绝对布局切换到自适应,预览空白 pmd
REPORT-1940 表单从绝对布局切换到自适应,预览空白
提示用户升级插件
无JIRA任务。新增国际化key
修改配置文件
股价图属性配置问题
无JIRA任务。国际化
国际化翻译
国际化修改
国际化翻译
无JIRA任务。国际化key
无JIRA任务, 冲突修正
ct
ct
国际化翻译
无JIRA任务 tab功能屏蔽
REPORT-1814 表单tab块的改良bug 功能屏蔽
...
|
8 years ago |
neil
|
0ebe0c9184
|
ct
|
8 years ago |
neil
|
19b23f813e
|
ct
|
8 years ago |
superman
|
2527e6fb36
|
Merge pull request #724 in BA/design from ~JU/1-ba-design:dev to dev
* commit '8691ee6d2f0d3a93179936fe1a4341bb322b2a14':
其他兼容
|
8 years ago |
juhaoyu
|
8691ee6d2f
|
其他兼容
|
8 years ago |
superman
|
5b6bc3bfd4
|
Merge pull request #723 in BA/design from ~ZACK/design:dev to dev
* commit '23b20520b8171d1ccae70c5fd7bb931f7bc6b6dc':
report-1343 ftp上传漏提交
|
8 years ago |
zack
|
23b20520b8
|
report-1343 ftp上传漏提交
|
8 years ago |
superman
|
64591249c5
|
Merge pull request #722 in BA/design from ~FANGLEI/design:dev to dev
* commit '53f31b794e9832b914ba2f6373de8991c323b7ae':
修改命名
修改一个命名
修正一个函数命名
去掉一个注释
修改一个小错误,WLayout->WSortLayout
|
8 years ago |
fanglei
|
53f31b794e
|
修改命名
|
8 years ago |
fanglei
|
c7ad29b02f
|
修改一个命名
|
8 years ago |
fanglei
|
3ddef78aec
|
修正一个函数命名
|
8 years ago |
fanglei
|
8ec71ac735
|
去掉一个注释
|
8 years ago |
fanglei
|
556c922343
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |
fanglei
|
f9e6d148c7
|
修改一个小错误,WLayout->WSortLayout
|
8 years ago |
superman
|
823e79126f
|
Merge pull request #718 in BA/design from ~PLOUGH/design:dev to dev
* commit '941ae3463c9fbb55d8bad845ef79986f9e93c8e4':
调整代码
无JIRA任务。修复Windows下函数管理器无法打开的问题
REPORT-1178 英文国际化——11/23
|
8 years ago |
superman
|
4a68c3d990
|
Merge pull request #721 in BA/design from ~NEIL/design:dev to dev
* commit 'ba719cab5edcfb234825a2ba11b119c9b3d3f3ba':
无JIRA任务, designer打包用1.7
|
8 years ago |