daniel
|
540b0f6e88
|
pmd
|
7 years ago |
daniel
|
7dc3d1b485
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/ba/design into 9.0
# 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_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
|
7 years ago |
daniel
|
a9b1d18b95
|
Merge http://www.finedevelop.com:2015/scm/ba/design into 9.0
# 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_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
|
7 years ago |
MoMeak
|
0411fda765
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
ae8b09b776
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
superman
|
e3810b3da6
|
Merge pull request #1003 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit '17dd361ba45a1fd1b74000fef06415bd79b35009':
REPORT-2897 9.0设计器修改 PMD
|
7 years ago |
MoMeak
|
17dd361ba4
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
3d36b16d05
|
REPORT-2897 9.0设计器修改
PMD
|
7 years ago |
superman
|
2c35f4c0fa
|
Merge pull request #1000 in BA/design from ~MOMEAK/design9.0:9.0 to 9.0
* commit 'cad0a13b56b0d0ef2d84ea515198ba80a4df17d1': (32 commits)
REPORT-3163 合作开发9.0设计器=>左侧可伸缩面板调整按钮位置
REPORT-2897 9.0设计器修改 PMD
REPORT-2897 9.0设计器修改 PMD
REPORT-3163 合作开发9.0设计器=>修正一处错误
REPORT-3163 合作开发9.0设计器=>pmd
REPORT-2897 9.0设计器修改 缩放条部分
REPORT-3163 合作开发9.0设计器=>左侧可伸缩面板改回原有设计
REPORT-2897 9.0设计器修改 缩放条部分
REPORT-2897 9.0设计器修改 缩放条部分
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(权限编辑)
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(聚合报表部分)
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(部分)
REPORT-2897 9.0设计器修改 缩放条部分
REPORT-3163 合作开发9.0设计器=>propertyItemList 改为 propertyItemMap(有序map)
REPORT-3163 合作开发9.0设计器=>所有tab弹出后,显示“无可用配置项”
REPORT-3163 合作开发9.0设计器=>交换弹出工具条的上下按钮
REPORT-3163 合作开发9.0设计器=>红色标出可拖动区域
REPORT-3163 合作开发9.0设计器=>面板标题国际化
REPORT-3163 合作开发9.0设计器=>修复弹窗bug:1、失焦后被设计器覆盖;2、弹出后,点击不同单元格,面板没有更新;3、弹出后,点击不同单元格,弹回,面板消失;4、切换面板时,内容不应被遮挡
REPORT-3163 合作开发9.0设计器=>弹出对话框可调整高度
...
|
7 years ago |
plough
|
cad0a13b56
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
plough
|
8aad89c2ba
|
REPORT-3163 合作开发9.0设计器=>左侧可伸缩面板调整按钮位置
|
7 years ago |
MoMeak
|
20c4524cab
|
REPORT-2897 9.0设计器修改
PMD
|
7 years ago |
MoMeak
|
8ede08dbc8
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
7d9ff599d6
|
REPORT-2897 9.0设计器修改
PMD
|
7 years ago |
superman
|
1bde389abf
|
Merge pull request #1002 in BA/design from ~KERRY/design:9.0 to 9.0
* commit '9fab2ae54179868e0c3b710d87e51312a61dcdbe':
REPORT-2354 修改qq登录问题
|
7 years ago |
superman
|
e4cc7f74fc
|
Merge pull request #1001 in BA/design from ~NEIL/design:9.0 to 9.0
* commit '6ad2ff3ac2ae701a95cb79ffbca0a3e77fe5a955':
转义符
REPORT-1013 用log4j记录日志.
|
7 years ago |
kerry
|
9fab2ae541
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
kerry
|
db1f871b91
|
REPORT-2354 修改qq登录问题
|
7 years ago |
neil
|
6ad2ff3ac2
|
转义符
|
7 years ago |
neil
|
440edce288
|
REPORT-1013 用log4j记录日志.
|
7 years ago |
plough
|
5d4fc485b9
|
REPORT-3163 合作开发9.0设计器=>修正一处错误
|
7 years ago |
plough
|
1d06cbfe19
|
REPORT-3163 合作开发9.0设计器=>pmd
|
7 years ago |
plough
|
f05624c113
|
合并“设计器修改”部分代码到9.0
|
7 years ago |
MoMeak
|
b1dfeb7891
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
9336b66173
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
plough
|
cc2dc6744c
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
plough
|
bc2ab1dbe9
|
REPORT-3163 合作开发9.0设计器=>左侧可伸缩面板改回原有设计
|
7 years ago |
MoMeak
|
70684914fa
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
cb344ec64a
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
MoMeak
|
e08c971d3f
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
plough
|
c10696c525
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
plough
|
4525ae72c9
|
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(权限编辑)
|
7 years ago |
plough
|
49e4850a00
|
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(聚合报表部分)
|
7 years ago |
plough
|
3d04d3d754
|
REPORT-3163 合作开发9.0设计器=>属性面板tab项动态变化(部分)
|
7 years ago |
rinoux
|
b851de1e5f
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '21cf2b783d5f105bf4473853d9f1fabb0daf58f9':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
MoMeak
|
2a10cb199f
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |
MoMeak
|
7173e76d4c
|
REPORT-2897 9.0设计器修改
缩放条部分
|
7 years ago |
plough
|
57954b2e8b
|
REPORT-3163 合作开发9.0设计器=>propertyItemList 改为 propertyItemMap(有序map)
|
7 years ago |
plough
|
64474ba905
|
REPORT-3163 合作开发9.0设计器=>所有tab弹出后,显示“无可用配置项”
|
7 years ago |
plough
|
abba216587
|
REPORT-3163 合作开发9.0设计器=>交换弹出工具条的上下按钮
|
7 years ago |
plough
|
a914c62961
|
REPORT-3163 合作开发9.0设计器=>红色标出可拖动区域
|
7 years ago |
plough
|
1d44dc94db
|
REPORT-3163 合作开发9.0设计器=>面板标题国际化
|
7 years ago |
plough
|
c5e83b3b13
|
REPORT-3163 合作开发9.0设计器=>修复弹窗bug:1、失焦后被设计器覆盖;2、弹出后,点击不同单元格,面板没有更新;3、弹出后,点击不同单元格,弹回,面板消失;4、切换面板时,内容不应被遮挡
|
7 years ago |
superman
|
21cf2b783d
|
Merge pull request #999 in BA/design from ~NEIL/design:9.0 to 9.0
* commit 'e2790a4cc8ffb16c10998e2b0343c88c4d70ef19':
utf8
REPORT-1013 用log4j记录日志.
|
7 years ago |
neil
|
e2790a4cc8
|
utf8
|
7 years ago |
neil
|
1aceeba735
|
REPORT-1013 用log4j记录日志.
|
7 years ago |
plough
|
caa4bcbfcd
|
Merge remote-tracking branch 'mm/9.0' into 9.0
|
7 years ago |
plough
|
e5c2b0afd8
|
REPORT-3163 合作开发9.0设计器=>弹出对话框可调整高度
|
7 years ago |
plough
|
4eda8b5566
|
REPORT-3163 合作开发9.0设计器=>调整固定弹窗的界面
|
7 years ago |
MoMeak
|
e9d400ca4e
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
7 years ago |