superman
|
e96f00a075
|
Merge pull request #132 in BA/design from ~GARYTU/design:dev to dev
* commit 'cf48cc3a1e4024057729ced6f6b403fd80612aec':
缩放属性面板
|
9 years ago |
Lee
|
cf48cc3a1e
|
缩放属性面板
|
9 years ago |
neil
|
8439ca1d2d
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
aab5f3253b
|
Merge pull request #131 in BA/design from ~NEIL/design:master to master
* commit 'e8cc320b88a0bbd58311a3946f0c1fb6e3ba629c':
24小时传一次
|
9 years ago |
|
neil
|
e8cc320b88
|
24小时传一次
|
9 years ago |
|
superman
|
21e2a145e4
|
Merge pull request #130 in BA/design from ~GARYTU/design:dev to dev
* commit '809dccafaa0753dcadb8d9ad36f4f6abab8567e8':
移动平台新需求改动： 1. 移动端最大高度限制属性迁移到“移动端属性”面板中，并还原之前的更改； 2. 设置竖屏为“纵向自适应”的时候，手机显示限制高度如果没有勾选，则自动勾选上☑️，并且不可以编辑（灰化效果暂时还没有做出来，晚点研究一下）
|
9 years ago |
|
Lee
|
809dccafaa
|
移动平台新需求改动：
1. 移动端最大高度限制属性迁移到“移动端属性”面板中，并还原之前的更改；
2. 设置竖屏为“纵向自适应”的时候，手机显示限制高度如果没有勾选，则自动勾选上☑️，并且不可以编辑（灰化效果暂时还没有做出来，晚点研究一下）
|
9 years ago |
|
superman
|
b8c8220117
|
Merge pull request #129 in BA/design from ~NEIL/design:master to master
* commit '7927e18f5855acbbd64ad7ec3299546ee49453f3':
设计器信息收集开启
|
9 years ago |
|
neil
|
7927e18f58
|
设计器信息收集开启
|
9 years ago |
|
neil
|
d84d0e644e
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
8b73c82bd2
|
Merge pull request #128 in BA/design from ~XIAXIANG/design1:dev to dev
* commit 'a23fa9ddf91aa27a2fcc31c11c723a6b16bd259c':
rt
rt
|
9 years ago |
xiaxiang
|
a23fa9ddf9
|
rt
|
9 years ago |
|
xiaxiang
|
19efd5e01c
|
rt
|
9 years ago |
|
superman
|
a43d351b45
|
Merge pull request #127 in BA/design from ~ZHOUPING/design:master to master
* commit 'aa18a3ceed09b8c82293126c6b9479287c231e41':
设计器关闭的时候需要调用一下fireServletStopListener，否则本地的平台还原功能没法使
|
9 years ago |
zhouping
|
aa18a3ceed
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~zhouping/design
|
9 years ago |
|
zhouping
|
982399bdf2
|
设计器关闭的时候需要调用一下fireServletStopListener，否则本地的平台还原功能没法使
|
9 years ago |
|
neil
|
0aff8f2e02
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
b831309bcb
|
Merge pull request #126 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'a47ad9e3a63464091ccdff1b788ea3f3fa8bf92d':
设计器关闭的时候需要调用一下fireServletStopListener，否则本地的平台还原功能没法使
|
9 years ago |
|
zhouping
|
a47ad9e3a6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev
|
9 years ago |
|
zhouping
|
c432e9c295
|
设计器关闭的时候需要调用一下fireServletStopListener，否则本地的平台还原功能没法使
|
9 years ago |
|
superman
|
2cc607e55d
|
Merge pull request #125 in BA/design from ~VITO/design:master to master
* commit '43cf9677adc9f5ca8a7d9a9dce685f0d73416c7f':
使用sitecenter替换所有url
mac下没有encode中文名登陆不上
|
9 years ago |
vito
|
43cf9677ad
|
使用sitecenter替换所有url
|
9 years ago |
|
vito
|
fd09cd369d
|
mac下没有encode中文名登陆不上
|
9 years ago |
|
neil
|
1a52cfaedf
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
superman
|
8da4aa2868
|
Merge pull request #124 in BA/design from ~VITO/design:dev to dev
* commit '363c8ec7460cc3da3340dc225cb9dad22050a0f5':
格式化
远程设计插件信息获取问题1/3
|
9 years ago |
|
neil
|
63d986c9dc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
|
vito
|
363c8ec746
|
格式化
|
9 years ago |
|
vito
|
4d5eb1708c
|
远程设计插件信息获取问题1/3
|
9 years ago |
|
superman
|
cd2ae34404
|
Merge pull request #123 in BA/design from ~XIAXIANG/design1:dev to dev
* commit 'f2b3034ddbeb377a60999972d20185bd385dc3a3':
rt
rt
|
9 years ago |
|
xiaxiang
|
f2b3034ddb
|
rt
|
9 years ago |
|
xiaxiang
|
11d33dfd80
|
rt
|
9 years ago |
|
superman
|
65f043cf9c
|
Merge pull request #122 in BA/design from ~NEIL/design:master to master
* commit 'ae681f8dde209c48b46d463c987ce1e15e57f724':
1
1
del
|
9 years ago |
|
neil
|
ae681f8dde
|
1
|
9 years ago |
|
neil
|
6256acbb1f
|
1
|
9 years ago |
|
neil
|
425a6a2962
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
9 years ago |
|
neil
|
2cb6db5d29
|
del
|
9 years ago |
|
superman
|
47fcd85422
|
Merge pull request #121 in BA/design from ~EASON/design:master to master
* commit '309943f3ab2c7990b05f3c9468bf0a1c4890434f':
界面
|
9 years ago |
eason-skx
|
309943f3ab
|
界面
|
9 years ago |
|
superman
|
616141ae3f
|
Merge pull request #120 in BA/design from ~NEIL/design:master to master
* commit '63a5286f07b877a44a9064d1903a0ff53d248f2b':
build failed
|
9 years ago |
|
neil
|
63a5286f07
|
build failed
|
9 years ago |
|
superman
|
ac93e76f30
|
Merge pull request #119 in BA/design from release to master
* commit 'a27d9aee82407834f412b35e8daba7c3e01cb72c': (41 commits)
1
1
1
冲突
冲突
old plugin level
api level
rt
无窗口设计
數據配置界面
catch更改
1、删除插件返回一个成功消息，供界面显示 2、更新过期插件弹出两个对话框的问题
d
d
这个入口删掉，不需要做模板数据集分组
web属性界面打不开
给决策平台修改密码和认证等加一个事件监听,剩下的什么删除用户等还没有加
分组插件需要把action开出去
加个参数
地图数据配置界面
...
|
9 years ago |
|
superman
|
a27d9aee82
|
Merge pull request #118 in BA/design from ~NEIL/design:release to release
* commit '8ce32a4fffdb348e71f7a1d186a62245713b1d5c':
1
1
1
冲突
冲突
1
1
冲突
|
9 years ago |
|
neil
|
8ce32a4fff
|
1
|
9 years ago |
|
neil
|
b1c040aff4
|
1
|
9 years ago |
|
neil
|
b5588b54d3
|
1
|
9 years ago |
|
neil
|
9e607e097c
|
冲突
|
9 years ago |
|
neil
|
0df8ff6097
|
冲突
|
9 years ago |
xiaohu
|
0ec29c51c5
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
9 years ago |
|
neil
|
7cfec4e5fb
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~neil/design into release
|
9 years ago |
|
neil
|
e8153b0963
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
9 years ago |
