superman
|
06a14a9863
|
Merge pull request #746 in BA/design from ~MANGO/design:dev to dev
* commit '9536b70257d75451f5b0d031b47c87d8636c5044':
分两行显示checkbox和输入框,适应国际化情况。
分两行显示checkbox和输入框,适应国际化情况。
分两行显示checkbox和输入框,适应国际化情况。
|
8 years ago |
paul
|
65c89cccdd
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
|
8 years ago |
superman
|
a459246578
|
Merge pull request #747 in BA/design from ~JU/1-ba-design:release to release
* commit '1a7eebe0867cae4494096e810b49a20805bca163':
REPORT-1835 sap插件导致管理系统下的定时调度没了
|
8 years ago |
juhaoyu
|
1a7eebe086
|
REPORT-1835 sap插件导致管理系统下的定时调度没了
|
8 years ago |
mengao
|
9536b70257
|
分两行显示checkbox和输入框,适应国际化情况。
|
8 years ago |
mengao
|
5993e65d4a
|
分两行显示checkbox和输入框,适应国际化情况。
|
8 years ago |
superman
|
301890942b
|
Merge pull request #745 in BA/design from ~YAOH.WU/design:dev to dev
* commit '98dc9f981f4fa7da7e16091c971468e4e746a84b':
8.0插件启用禁用重启设计器confirm对话框保留,在9.0删除
REPORT-1957,并且修改参数说明资源文件的编码方式为utf-8,加载资源时使用utf-8编码
“REPORT-2030删除designer对话框”
|
8 years ago |
yaoh.wu
|
98dc9f981f
|
8.0插件启用禁用重启设计器confirm对话框保留,在9.0删除
|
8 years ago |
yaoh.wu
|
505dd7e910
|
REPORT-1957,并且修改参数说明资源文件的编码方式为utf-8,加载资源时使用utf-8编码
|
8 years ago |
superman
|
7fd694a56e
|
Merge pull request #744 in BA/design from ~KERRY/design:dev to dev
* commit '14ab8a49694aefa2531b76bd8ae6eca63f3e495e':
REPORT-1858 frm组件隐藏
|
8 years ago |
kerry
|
14ab8a4969
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev
|
8 years ago |
kerry
|
015d53588e
|
REPORT-1858 frm组件隐藏
|
8 years ago |
plough
|
4cf251a8ed
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
mengao
|
7f7841b803
|
分两行显示checkbox和输入框,适应国际化情况。
|
8 years ago |
superman
|
e264d13730
|
Merge pull request #743 in BA/design from ~ZACK/design:dev to dev
* commit '9148270e2a00ad642d073216d34e8826043f06a3':
REPORT-1980 换成listmap维持原有顺序
|
8 years ago |
zack
|
9148270e2a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
8 years ago |
zack
|
0bcbfe576d
|
REPORT-1980 换成listmap维持原有顺序
|
8 years ago |
plough
|
af03d197f0
|
REPORT-1916 做模板的过程和耗时收集=》完成基本信息的本地存取
|
8 years ago |
yaohwu
|
81e5c2aacf
|
“REPORT-2030删除designer对话框”
|
8 years ago |
superman
|
500b23e418
|
Merge pull request #739 in BA/design from ~ZHENG/design:dev to dev
* commit '269d6a97ec3980666b68568420361de71bbf4118':
editlabel not append origin label
|
8 years ago |
superman
|
77c44b9d7f
|
Merge pull request #740 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'd2730c56f7790ce1ea070d739d13e4dfcf9aebc3':
无任务 调整代码
无JIRA任务,调整代码
无jira任务,属性修改为私有
REPORT-1899
|
8 years ago |
yaoh.wu
|
d2730c56f7
|
无任务 调整代码
|
8 years ago |
fr_shine
|
269d6a97ec
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
8 years ago |
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 |