hzzz
7fb2911df8
fix
7 years ago
hzzz
97fc573e71
fix
7 years ago
superman
d516123b39
Merge pull request #58 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0
...
* commit 'dc478aadeaa105874397cc85339f4a46f55cffaa':
add dependency
7 years ago
hzzz
dc478aadea
add dependency
7 years ago
superman
7ae3c3f2ed
Merge pull request #57 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
...
* commit '643b69ea58ccfc46202bbb333d6602fff013e96b':
无JIRA任务 Log整理
7 years ago
richie
643b69ea58
无JIRA任务 Log整理
7 years ago
superman
10dfb0293a
Merge pull request #52 in DESIGN/design from ~HZZZ/design-100000:env to feature/10.0
...
* commit '3838b06108bc132d2508c5bfb8023872cc9f7e40':
check
merge
merge
merge
merge
start designer socket client
merge
merge
env..
7 years ago
hzzz
3838b06108
check
7 years ago
hzzz
e9cec1e073
merge
7 years ago
hzzz
fcde3830ab
Merge branch 'feature/10.0' into env
7 years ago
Hzzz
13ebc32441
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
...
* commit '3a646b7ff9b07a59663e6e03d63e6ce0d6bf6d0a':
无JIRA任务 fix
REPORT-8114 数据集字典 设计器无响应
REPORT-8105 修改绝对画布块缩放逻辑 报错
REPORT-7261 右侧事件编辑面板隐藏问题
无任务,做短信事件插件发现的设计器bug
REPORT-6973 模板短信事件 插件设计器接口
REPORT-6949 条件属性的超级链接重命名后会自动生成超级链接
REPORT-6868 设计器数据列单元格切换频繁弹出sql参数对话框
REPORT-5856 插件管理新分类 平台插件分类过滤失效
REPORT-6096 TAB页中组件在复制粘贴后会位移
无任务,决策报表编辑报表块报错
无任务,slider和quickeditor的内存问题
7 years ago
superman
3a646b7ff9
Merge pull request #56 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
...
* commit '872f5b2f951ae05cb6aa2eb0f0d24211a9a77218':
无JIRA任务 fix
7 years ago
ju
872f5b2f95
无JIRA任务 fix
7 years ago
superman
203b136e24
Merge pull request #55 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit '501ea1fb40ac0d645cc1074cefeda0ba5940f044':
REPORT-8114 数据集字典 设计器无响应
REPORT-8105 修改绝对画布块缩放逻辑 报错
REPORT-7261 右侧事件编辑面板隐藏问题
无任务,做短信事件插件发现的设计器bug
REPORT-6973 模板短信事件 插件设计器接口
REPORT-6949 条件属性的超级链接重命名后会自动生成超级链接
REPORT-6868 设计器数据列单元格切换频繁弹出sql参数对话框
REPORT-5856 插件管理新分类 平台插件分类过滤失效
REPORT-6096 TAB页中组件在复制粘贴后会位移
无任务,决策报表编辑报表块报错
无任务,slider和quickeditor的内存问题
7 years ago
hzzz
55b20fe0a6
merge
7 years ago
yaoh.wu
501ea1fb40
REPORT-8114 数据集字典 设计器无响应
7 years ago
yaoh.wu
108372f534
REPORT-8105 修改绝对画布块缩放逻辑 报错
7 years ago
yaoh.wu
b215a6abed
REPORT-7261 右侧事件编辑面板隐藏问题
7 years ago
yaoh.wu
fe9584ccfe
无任务,做短信事件插件发现的设计器bug
7 years ago
yaoh.wu
e06c49e5c5
REPORT-6973 模板短信事件 插件设计器接口
7 years ago
yaoh.wu
2eaeba9f96
REPORT-6949 条件属性的超级链接重命名后会自动生成超级链接
7 years ago
yaoh.wu
5c7c5acef3
REPORT-6868 设计器数据列单元格切换频繁弹出sql参数对话框
7 years ago
yaoh.wu
41a03ac1e4
REPORT-5856 插件管理新分类 平台插件分类过滤失效
7 years ago
yaoh.wu
7b12c56f99
REPORT-6096 TAB页中组件在复制粘贴后会位移
7 years ago
yaoh.wu
304449fd19
无任务,决策报表编辑报表块报错
7 years ago
yaoh.wu
f2b67d482d
无任务,slider和quickeditor的内存问题
7 years ago
hzzz
cd26cd96bc
merge
7 years ago
hzzz
0ddf68a97a
merge
7 years ago
hzzz
a1fdd0b66e
merge
7 years ago
superman
78cc76ca33
Merge pull request #54 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit '5e8bbeef0aee8a8865092a91a488bc0ff0be7f6a':
REPORT-6700 完善+远程设计过渡方案
REPORT-6700 列表过滤
7 years ago
yaoh.wu
5e8bbeef0a
REPORT-6700 完善+远程设计过渡方案
7 years ago
yaoh.wu
6779e3e6c0
REPORT-6700 列表过滤
7 years ago
superman
d0cc9c7c36
Merge pull request #53 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '757a2d615b69ef24fe1c3b6897513e028ad75464':
REPORT-8383 水印支持换行与功能点入库 => 功能点入库
7 years ago
plough
757a2d615b
REPORT-8383 水印支持换行与功能点入库 => 功能点入库
7 years ago
hzzz
d6258df530
start designer socket client
7 years ago
hzzz
39a1bcb6a2
merge
7 years ago
hzzz
b9b023752e
merge
7 years ago
hzzz
d247e8b74a
env..
7 years ago
superman
6c81ea4a5f
Merge pull request #49 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0
...
* commit '45db1f86a6415f9ed67617a1b79a04f1f23cffac':
无JIRA任务,拼写错误.
7 years ago
superman
c3b70396dc
Merge pull request #51 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit 'dd6504b9b78e2263b4210c1be11af177196b5213':
REPORT-7222 安全性之水印=>调整代码
7 years ago
plough
dd6504b9b7
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
7 years ago
plough
d1a641dd3a
REPORT-7222 安全性之水印=>调整代码
7 years ago
superman
4586e18897
Merge pull request #50 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '7a589be3aa9717299557dcd31f45f6995a7d682d':
REPORT-7222 安全性之水印=>调整代码
7 years ago
plough
7a589be3aa
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
7 years ago
plough
aa786003a8
REPORT-7222 安全性之水印=>调整代码
7 years ago
neil
45db1f86a6
无JIRA任务,拼写错误.
7 years ago
superman
28e0ea9be7
Merge pull request #47 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0
...
* commit 'db0625962057aac67311eab623dd0dd5a24c9652':
1
兼容
REPORT-8226 除了report相关的公式, 其他公式放core.
7 years ago
superman
58268216c9
Merge pull request #46 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit '64de3e05a8b0b00697b277dbf5064abd16f73cce':
doc
删除无用代码
REPORT-6700 国际化
REPORT-6700 数据传输 和 存储
REPORT-6700 远程设计权限
REPORT-6700 update
remote design pilot
remote design use http get method
remote design use http get method
todo update tree
todo update tree
file tree
file tree
update
save
REPORT-6700 远程设计权限
REPORT-6700 远程设计权限
7 years ago
superman
2a590cc839
Merge pull request #48 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '6cf9cd404f88f0131699355be2b4ca915b469c9c':
REPORT-7222 安全性之水印=>支持公式
REPORT-7222 安全性之水印=>调整代码
7 years ago
neil
db06259620
1
7 years ago