superman
|
96e66e3529
|
Merge pull request #703 in BA/design from ~PAUL/design:master to master
* commit '30f17ef98a65101d1fa64c568d1b3191a4f142b1':
REPORT-1940 表单从绝对布局切换到自适应,预览空白 pmd
REPORT-1940 表单从绝对布局切换到自适应,预览空白
提示用户升级插件
无JIRA任务。新增国际化key
修改配置文件
股价图属性配置问题
无JIRA任务。国际化
国际化翻译
国际化修改
国际化翻译
无JIRA任务。国际化key
国际化翻译
|
8 years ago |
paul
|
30f17ef98a
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.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 |
superman
|
27865540b0
|
Merge pull request #702 in BA/design from ~ZHOUPING/design:release to release
* commit '4f599cdfa6c618e88f51b18a73b6e8bcf0941a78':
REPORT-1940 表单从绝对布局切换到自适应,预览空白 pmd
REPORT-1940 表单从绝对布局切换到自适应,预览空白
|
8 years ago |
zhouping
|
4f599cdfa6
|
REPORT-1940 表单从绝对布局切换到自适应,预览空白
pmd
|
8 years ago |
zhouping
|
05b6fd9f85
|
REPORT-1940 表单从绝对布局切换到自适应,预览空白
|
8 years ago |
superman
|
1796e36144
|
Merge pull request #698 in BA/design from ~JU/design1111:release to release
* commit 'c6a96cc457ee95cf1cb21519677571047c425589':
提示用户升级插件
|
8 years ago |
juhaoyu
|
c6a96cc457
|
提示用户升级插件
|
8 years ago |
superman
|
8bf3202a80
|
Merge pull request #695 in BA/design from ~PLOUGH/design:release to release
* commit '28317954b67b74739ef2dea1375071a0f5b6651c':
无JIRA任务。新增国际化key
|
8 years ago |
plough
|
28317954b6
|
无JIRA任务。新增国际化key
|
8 years ago |
superman
|
6f84d5c214
|
Merge pull request #690 in BA/design from ~PLOUGH/design:release to release
* commit 'ef938eb4f355e9f70d4a71e622be07b95995aef4':
修改配置文件
无JIRA任务。国际化
无JIRA任务。国际化key
|
8 years ago |
superman
|
e6d4f22bd8
|
Merge pull request #691 in BA/design from ~ZHENG/design:release to release
* commit 'e91765d4046665442b2006eab3e8513d0dc1d8ec':
股价图属性配置问题
|
8 years ago |
plough
|
ef938eb4f3
|
修改配置文件
|
8 years ago |
fr_shine
|
e91765d404
|
股价图属性配置问题
|
8 years ago |
plough
|
c1f8641e89
|
合并冲突
|
8 years ago |
plough
|
30ac27a511
|
无JIRA任务。国际化
|
8 years ago |
superman
|
7658ee2d69
|
Merge pull request #682 in BA/design from ~LILY/design:release to release
* commit '66337fa78c347b88fabfa74f40e28c7dcc6f121e':
国际化翻译
|
8 years ago |
unknown
|
66337fa78c
|
国际化翻译
|
8 years ago |
superman
|
5779f5f072
|
Merge pull request #680 in BA/design from ~GREY/design:release to release
* commit 'ef6af3b33eaf8cfa818499f9ad3ae3275adbd271':
国际化修改
|
8 years ago |
wanling wang
|
ef6af3b33e
|
国际化修改
|
8 years ago |
richie
|
cbcd7470dc
|
Merge pull request #677 in BA/design from ~LILY/design:release to release
* commit 'f9853011d43869ed6eca3e8c4a9c97b5ff3875d3':
国际化翻译
国际化翻译
|
8 years ago |
unknown
|
f9853011d4
|
国际化翻译
|
8 years ago |
unknown
|
a3d468e6da
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~lily/design into release
|
8 years ago |
plough
|
925a72e781
|
无JIRA任务。国际化key
|
8 years ago |
neil
|
78e998493d
|
Merge pull request #676 in BA/design from ~NEIL/design:master to master
* commit 'fb6e4806564957f5cedc93a83d37c76d93f92f5f':
无JIRA任务, 冲突修正
|
8 years ago |
neil
|
fb6e480656
|
无JIRA任务, 冲突修正
|
8 years ago |
superman
|
e338a0198e
|
Merge pull request #673 in BA/design from ~NEIL/design:release to master
* commit '2169ef5cf934e5fbd589eb5780cb30aff2502f43': (87 commits)
ct
ct
国际化翻译
无JIRA任务 tab功能屏蔽
REPORT-1814 表单tab块的改良bug 功能屏蔽
xxx
REPORT-1814 表单tab块的页签拖动新功能 bugfix
pmd的国际化字符串问题
pmd
com.dr.data.SubmitJob接口提示更改
REPORT-1808 字体,背景
REPORT-1808 font空值判断给予默认值
1
REPORT-1808 设计器内tab bug修复
REPORT-1390 设计器中,在选中“悬浮元素”时,隐藏右侧的“单元格属性表”面板
遗漏了一个地方
之前接口开得有问题,部署时算子初始化会出错【读不到函数,因为依赖中有designer的类】
更改接口,分离原来的方法,单独成接口,为了方便算子生成时获取分组接口里面的函数。没有动FinctionGroup这个接口,因为动这里牵扯太广了,单独做一个接口专职获取公式就好
REPORT-576 字体设置功能完善
1
...
|
8 years ago |
neil
|
2169ef5cf9
|
ct
|
8 years ago |
neil
|
34e1c9c95b
|
ct
|
8 years ago |
superman
|
ef6043fb55
|
Merge pull request #670 in BA/design from ~GREY/design:release to release
* commit '604f0cbc21a20c37dddd310ce4d1988b3ba17eef':
国际化翻译
|
8 years ago |
wanling wang
|
604f0cbc21
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~grey/design into release
|
8 years ago |
wanling wang
|
faabc89c88
|
国际化翻译
|
8 years ago |
superman
|
b803592afb
|
Merge pull request #669 in BA/design from ~ZHOUPING/design:release to release
* commit 'efbda3dcf5bc4e132cf5b870da5c1aebfd7ff9cc':
无JIRA任务 tab功能屏蔽
|
8 years ago |
zhouping
|
efbda3dcf5
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release
|
8 years ago |
zhouping
|
12fc6d4f86
|
无JIRA任务 tab功能屏蔽
|
8 years ago |
superman
|
b81febf662
|
Merge pull request #668 in BA/design from ~ZHOUPING/design:release to release
* commit 'de903cf9a2fdae8cfd60f54fe64033e75fc631eb':
REPORT-1814 表单tab块的改良bug 功能屏蔽
|
8 years ago |
zhouping
|
de903cf9a2
|
REPORT-1814 表单tab块的改良bug
功能屏蔽
|
8 years ago |
unknown
|
6e41745aa9
|
国际化翻译
|
8 years ago |
superman
|
5226afd56d
|
Merge pull request #667 in BA/design from ~LILY/design:release to release
* commit '61cba0e483efdba37db33f37cf85218b90553c32':
xxx
|
8 years ago |
unknown
|
61cba0e483
|
xxx
|
8 years ago |
superman
|
7f4982eca5
|
Merge pull request #666 in BA/design from ~ZHOUPING/design:release to release
* commit '6404579f1774d061a678dba07dd407a105419241':
REPORT-1814 表单tab块的页签拖动新功能 bugfix
|
8 years ago |
zhouping
|
6404579f17
|
REPORT-1814 表单tab块的页签拖动新功能
bugfix
|
8 years ago |
neil
|
b3016b0e20
|
Merge pull request #663 in BA/design from ~LOY/design_fr:release to release
* commit 'cdb7de829520a8bfa2cbb2a1c3c6398b4e553f22':
pmd的国际化字符串问题
pmd
com.dr.data.SubmitJob接口提示更改
|
8 years ago |
lonord
|
cdb7de8295
|
pmd的国际化字符串问题
|
8 years ago |
lonord
|
f3d25158fe
|
pmd
|
8 years ago |
lonord
|
7bd8497060
|
Merge branch 'release' of ssh://www.finedevelop.com:7999/~loy/design_fr into release
|
8 years ago |
lonord
|
142246013e
|
com.dr.data.SubmitJob接口提示更改
|
8 years ago |
superman
|
e408b5ee40
|
Merge pull request #661 in BA/design from ~LEE/design_release:release to release
* commit 'a2a7a6bd155c5bd97ac181cc37b4e603affde8d7':
REPORT-1808 字体,背景
|
8 years ago |
lee
|
a2a7a6bd15
|
REPORT-1808 字体,背景
1.字体设置之后的控件的宽度,导致设计器端的显示异常。
2.背景设置恢复默认之后,后台的属性设置为空。
|
8 years ago |
superman
|
883f6a580a
|
Merge pull request #660 in BA/design from ~LEE/design_release:release to release
* commit '3b5c88284205dfe01a381e182fb4ba357914b846':
REPORT-1808 font空值判断给予默认值
|
8 years ago |
lee
|
3b5c882842
|
REPORT-1808 font空值判断给予默认值
|
8 years ago |