vito
|
ada306b10b
|
漏掉一个
|
9 years ago |
|
vito
|
8468275188
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
# Conflicts:
# designer/src/com/fr/design/mainframe/bbs/BBSDialog.java
# designer_base/src/com/fr/design/extra/PluginManagerPane.java
|
9 years ago |
|
vito
|
ad4bc04cde
|
dubug去掉
|
9 years ago |
|
vito
|
3921be849b
|
jdk1.8打开新插件管理
|
9 years ago |
|
vito
|
31cc16f4c8
|
设计器插件商店更新和搜索API改动
|
9 years ago |
eason
|
8cb05ab06c
|
Merge pull request #38 in BA/design from ~XIAOHU/design:dev to dev
* commit '150a3fcbf45f5bf105d1826c334b8e75b5b28bcc':
update
透明度
|
9 years ago |
xiaohu
|
150a3fcbf4
|
update
|
9 years ago |
|
xiaohu
|
9c8b01bddd
|
透明度
|
9 years ago |
|
vito
|
805dc06959
|
插件商店搜索
|
9 years ago |
|
vito
|
1987927759
|
插件商店的一些java数据API
|
9 years ago |
|
vito
|
97140c177c
|
插件商店API
|
9 years ago |
richie
|
7da401a60e
|
Merge pull request #35 in BA/design from ~SHINE/design:dev to dev
* commit '5b1018e88b99dd830f48b79e06a9e7bf9e776963':
uispinner卡
|
9 years ago |
fr_shine
|
5b1018e88b
|
uispinner卡
|
9 years ago |
|
eason
|
b3fa11ec7a
|
Merge pull request #34 in BA/design from ~SHINE/design:dev to dev
* commit '33f98054aa80fe57734c77d34987277ddc79ce4a':
图表类型选择对话框
|
9 years ago |
|
fr_shine
|
33f98054aa
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~shine/design into dev
|
9 years ago |
|
fr_shine
|
51b2bf11a4
|
图表类型选择对话框
|
9 years ago |
|
eason
|
38c05fda18
|
Merge pull request #31 in BA/design from ~RICHIE/design:dev to dev
* commit '38e38a990f42ec8dbe246ddcfb97a9420d6a7f5f':
统一管理地址
统一管理地址
|
9 years ago |
|
richie
|
24d9f724b3
|
Merge pull request #33 in BA/design from ~VITO/design:咨询窗接口 to dev
* commit 'fd835be1739c3a10bfd315c88e4b92ff1702ee28':
bbs弹窗bug修复
|
9 years ago |
|
vito
|
fd835be173
|
bbs弹窗bug修复
|
9 years ago |
|
vito
|
36b48b30dc
|
切换分支
|
9 years ago |
|
vito
|
c630243fda
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '3dea98ecafd175af95e6664949513dc3905f9805':
去掉重复加载
|
9 years ago |
|
richie
|
38e38a990f
|
统一管理地址
|
9 years ago |
|
richie
|
44fb955f58
|
统一管理地址
|
9 years ago |
|
richie
|
3dea98ecaf
|
Merge pull request #30 in BA/design from ~VITO/design:咨询窗接口 to dev
* commit '093749b709c80ac58cc6b758ec2bdee9a05c7e1f':
去掉重复加载
|
9 years ago |
|
vito
|
91764a0a0c
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '1019706a1f19dabcef96c639e929745626fbc847':
窗口缩放到合适的外宽高
点击链接后能接着使用关闭脚本
BBSDialog.this
注释漏传了
web端的接口不独立文件
咨询框接口
rt
rt
注释
cas url接口
|
9 years ago |
|
vito
|
093749b709
|
去掉重复加载
|
9 years ago |
|
richie
|
1019706a1f
|
Merge pull request #28 in BA/design from ~VITO/design:咨询窗接口 to dev
* commit 'c1525c860620ae610801ebaf39170024c22ad4fb':
窗口缩放到合适的外宽高
点击链接后能接着使用关闭脚本
|
9 years ago |
|
vito
|
c1525c8606
|
窗口缩放到合适的外宽高
|
9 years ago |
|
vito
|
0c6563bf87
|
点击链接后能接着使用关闭脚本
|
9 years ago |
|
richie
|
099cbcf6c6
|
Merge pull request #26 in BA/design from ~VITO/design:咨询窗接口 to dev
* commit 'efb1cfb769a6b12a3272902d3f01026e078e3a01':
BBSDialog.this
注释漏传了
web端的接口不独立文件
咨询框接口
咨询窗体去掉边框
|
9 years ago |
|
vito
|
efb1cfb769
|
BBSDialog.this
|
9 years ago |
|
vito
|
54961579ec
|
注释漏传了
|
9 years ago |
|
vito
|
776116ee01
|
web端的接口不独立文件
|
9 years ago |
|
vito
|
b39cc4dd83
|
咨询框接口
|
9 years ago |
|
vito
|
69455f31fa
|
添加删除
|
9 years ago |
|
vito
|
cbbf0bf07c
|
1、更改插件窗口以适配插件商店布局设计
2、添加获取插件新的请求
|
9 years ago |
|
richie
|
ca253af194
|
Merge pull request #18 in BA/design from ~XIAXIANG/design:dev to dev
* commit '0bb1a5cbc8414b9fd61980a768c677e78eb2d642':
rt
rt
|
9 years ago |
xiaxiang
|
0bb1a5cbc8
|
rt
|
9 years ago |
|
xiaxiang
|
e66877156d
|
rt
|
9 years ago |
neil
|
05b1ade42f
|
Merge pull request #17 in BA/design from ~NEIL/design:dev to dev
* commit '2b15a96f92f9a209e9895cb60de1f5526f925f30':
注释
cas url接口
|
9 years ago |
 neil
|
2b15a96f92
|
注释
|
9 years ago |
|
neil
|
efd4f70970
|
cas url接口
|
9 years ago |
|
vito
|
0a0f829c49
|
咨询窗体去掉边框
|
9 years ago |
|
eason
|
ec488684c0
|
Merge pull request #15 in BA/design from ~XIAOHU/design:master to dev
* commit 'fd35f75ccbaa0db99463bddde2d39906d3c56f74':
update
更改地图自定义颜色计算方法
update
update
为大数据提供创建条件属性面板的接口
|
9 years ago |
|
xiaohu
|
fd35f75ccb
|
update
|
9 years ago |
|
xiaohu
|
89f7af002c
|
更改地图自定义颜色计算方法
|
9 years ago |
|
eason
|
42e7850fe2
|
Merge pull request #13 in BA/design from ~SHINE/design:dev to dev
* commit '5b782967bce2a0758d579efaa8d95b7714be0c27':
bug90361：3d圆环图系列界面
|
9 years ago |
|
fr_shine
|
5b782967bc
|
bug90361：3d圆环图系列界面
|
9 years ago |
|
xiaohu
|
310c9bc453
|
update
|
9 years ago |
|
xiaohu
|
6e2d9ee811
|
update
|
9 years ago |
