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
neil
0053a8c425
兼容
7 years ago
plough
6cf9cd404f
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
7 years ago
plough
458ffcf0f5
REPORT-7222 安全性之水印=>支持公式
7 years ago
neil
f91069e783
REPORT-8226 除了report相关的公式, 其他公式放core.
7 years ago
plough
68ed359f97
REPORT-7222 安全性之水印=>调整代码
7 years ago
yaoh.wu
64de3e05a8
doc
7 years ago
yaoh.wu
d35c4dd571
删除无用代码
7 years ago
yaoh.wu
773de9c19b
REPORT-6700 国际化
7 years ago
yaoh.wu
9836db8da7
REPORT-6700 数据传输 和 存储
7 years ago
yaoh.wu
bab0b9db35
REPORT-6700 远程设计权限
7 years ago
yaoh.wu
936a76ce29
REPORT-6700 update
7 years ago
superman
d45c573fa6
Merge pull request #45 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '6b0814a4dfc11bde1390e584b1514594e9a60816':
REPORT-8126 水印 前端样式属性, 浮层, 点击穿透=>后台数据传递
REPORT-8125 水印 设计器配置界面与实时预览=>改名
7 years ago
plough
6b0814a4df
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
7 years ago
plough
970e0b5b77
REPORT-8126 水印 前端样式属性, 浮层, 点击穿透=>后台数据传递
7 years ago
superman
6f623e729a
Merge pull request #43 in DESIGN/design from ~ABEL.CHEN/design:feature/10.0 to feature/10.0
...
* commit '3b47392ac9345e9cf0a5e4f2eb39d127d026bbb5':
DBEnv改名
7 years ago
superman
d7b3f70f20
Merge pull request #44 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
...
* commit 'c0abf24a5c61a38fd7aaf3ead0f3d71560049464':
无JIRA任务 从设计器打开产品演示,能正确的打开决策平台
7 years ago
CL
3b47392ac9
DBEnv改名
7 years ago
richie
c0abf24a5c
无JIRA任务 从设计器打开产品演示,能正确的打开决策平台
7 years ago
yaoh.wu
9b99bfb7cc
remote design pilot
7 years ago
yaoh.wu
8fa268e8a5
remote design use http get method
7 years ago
yaoh.wu
25acdee050
remote design use http get method
7 years ago
yaoh.wu
540d666a13
todo update tree
7 years ago
yaoh.wu
89e0532df1
todo update tree
7 years ago
yaoh.wu
0ebd6831eb
file tree
7 years ago
yaoh.wu
f2131d1f21
file tree
7 years ago
yaoh.wu
ca778b2b15
update
7 years ago
yaoh.wu
3d4f707c56
save
7 years ago
superman
911688a479
Merge pull request #42 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
...
* commit 'd950b4e8bfd647ef5843191ca302d1d5561f90dc':
无JIRA任务 换了个1.7的jdk,编译出错
7 years ago
ju
d950b4e8bf
无JIRA任务 换了个1.7的jdk,编译出错
7 years ago
plough
29f4f6c849
REPORT-8125 水印 设计器配置界面与实时预览=>改名
7 years ago
superman
c07ed9a7a7
Merge pull request #41 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit 'b17f56af4c2e059fa923e874d316988c02ed9d5f':
REPORT-8125 水印 设计器配置界面与实时预览=>改为AttrMark
7 years ago
plough
b17f56af4c
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
7 years ago
plough
2f81f19cbb
REPORT-8125 水印 设计器配置界面与实时预览=>改为AttrMark
7 years ago
superman
3d268c04da
Merge pull request #40 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
...
* commit '868e95047dd04dc45486f38372b4867a01937779':
REPORT-8125 水印 设计器配置界面与实时预览=>完善国际化
REPORT-8125 水印 设计器配置界面与实 时预览=>核心功能完成
REPORT-8125 水印 设计器配置界面与实时预览=>完成基本框架
7 years ago
yaoh.wu
8a81a5d533
REPORT-6700 远程设计权限
7 years ago