hzzz
|
ed0a5118fa
|
env
|
7 years ago |
superman
|
3d528d9045
|
Merge pull request #112 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit 'e527a1149a05cd337d1c10b26adb810578e85847':
REPORT-8355 9.0之前开发的功能与bug patch到10.0(feature部分)
|
7 years ago |
plough
|
e527a1149a
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
|
7 years ago |
plough
|
d4a3c005b5
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0(feature部分)
|
7 years ago |
superman
|
f185ceafe9
|
Merge pull request #111 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4ceec195edcd347a1aca086d32fb3437b617c09e':
无JIRA任务 静态资源servlet添加的方式不对,修改下
|
7 years ago |
ju
|
4ceec195ed
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
ju
|
7f1226324f
|
无JIRA任务 静态资源servlet添加的方式不对,修改下
|
7 years ago |
superman
|
b0ae4f6bb7
|
Merge pull request #107 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'f7cf0dc38a58c2972aa1cf90269b613b01f5bf01':
REPORT-8515 设计器启动优化,独立线程打开模板
|
7 years ago |
superman
|
93d33fa1d1
|
Merge pull request #108 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit '0e6cbfbb0c371ee8dd418b5542464b9895254e92':
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
superman
|
319fa725f5
|
Merge pull request #109 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '20d7b397a669155720bdade84e1db6fca190d38c':
无JIRA任务 读取资源文件
无JIRA任务 密码加密
无JIRA任务 远程设计登录登出修改(部分)
|
7 years ago |
hzzz
|
5219c6e0d2
|
env
|
7 years ago |
hzzz
|
068fe844e6
|
env
|
7 years ago |
richie
|
20d7b397a6
|
无JIRA任务 读取资源文件
|
7 years ago |
plough
|
0e6cbfbb0c
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
|
7 years ago |
plough
|
c002925ca8
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
richie
|
c5bea16bc8
|
无JIRA任务 密码加密
|
7 years ago |
zack
|
f7cf0dc38a
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~zack/design
|
7 years ago |
zack
|
e7f6457438
|
REPORT-8515 设计器启动优化,独立线程打开模板
|
7 years ago |
superman
|
e241c98565
|
Merge pull request #106 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'b19acc8d55ae565ad880cade94f98a57d23ae705':
REPORT-8630 插件管理的国际化都有问题(先改回去,后面统一改下国际化)
|
7 years ago |
kerry
|
b19acc8d55
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
kerry
|
43d8270a47
|
REPORT-8630 插件管理的国际化都有问题(先改回去,后面统一改下国际化)
|
7 years ago |
richie
|
8b153a0fbb
|
无JIRA任务 远程设计登录登出修改(部分)
|
7 years ago |
superman
|
f1a619fac1
|
Merge pull request #105 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit 'e8c55241c3d7cf3c3e29bb93d76de4fd2a34e15a':
无JIRA任务,修复编译问题
|
7 years ago |
plough
|
e8c55241c3
|
无JIRA任务,修复编译问题
|
7 years ago |
superman
|
bd7d7211c2
|
Merge pull request #104 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'd3a7929afbbbd73bf262adaa67f6ad77fd326d7d':
无JIRA任务 先加回来打包
|
7 years ago |
ju
|
d3a7929afb
|
无JIRA任务 先加回来打包
|
7 years ago |
superman
|
1537a8cc90
|
Merge pull request #103 in DESIGN/design from ~ABEL.CHEN/design:feature/10.0 to feature/10.0
* commit 'dd08160aef03ab2daee1684a68f0fdba4d20f5e3':
设计器监听服务端配置修改
|
7 years ago |
superman
|
25829700ac
|
Merge pull request #102 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit '7e748899f35a281486a10bf1b0f4d6758e5fb7e8':
REPORT-8393 插件管理界面无法启动
|
7 years ago |
vito
|
7e748899f3
|
REPORT-8393 插件管理界面无法启动
|
7 years ago |
CL
|
dd08160aef
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~abel.chen/design into feature/10.0
|
7 years ago |
CL
|
ebb917574c
|
设计器监听服务端配置修改
|
7 years ago |
superman
|
c251f173b2
|
Merge pull request #101 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit '2dc0a0da7322aa73044bb2cff5558e7507188e5a':
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
plough
|
2dc0a0da73
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
|
7 years ago |
plough
|
fe3a74f680
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
superman
|
40d135c41e
|
Merge pull request #100 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '29a7ae32b6793a7aff86d4f89bd138fac891ded4':
无JIRA任务 远程设计界面配置对应修改(部分)
|
7 years ago |
richie
|
29a7ae32b6
|
无JIRA任务 远程设计界面配置对应修改(部分)
|
7 years ago |
superman
|
77f0014603
|
Merge pull request #99 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'f169fb0b0fe07b3ebf32bb10d24f8c79d696622b':
REPORT-8357 .0之前开发的功能与bug patch到10.0 图片压缩
|
7 years ago |
plough
|
e356bfb487
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
zack
|
f169fb0b0f
|
REPORT-8357 .0之前开发的功能与bug patch到10.0 图片压缩
|
7 years ago |
superman
|
165106227c
|
Merge pull request #98 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0
* commit '3511fcf79061aa0fabfecc00a6691539cdc72a5e':
无JIRA任务,改下SQLite默认路径
|
7 years ago |
neil
|
3511fcf790
|
无JIRA任务,改下SQLite默认路径
|
7 years ago |
superman
|
b84336b300
|
Merge pull request #97 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4aa3641c1dce2ac1e4382ac70a9b0a4ffd05e3ed':
fix
CORE-76 Activator重复启动内置服务器、切换环境的支持 完善core中模块的关闭逻辑
|
7 years ago |
ju
|
4aa3641c1d
|
fix
|
7 years ago |
ju
|
9c40315bbb
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
完善core中模块的关闭逻辑
|
7 years ago |
superman
|
b5f39aaa09
|
Merge pull request #96 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '05772f2448f6e40364794816f04177c1f4da0e82':
CORE-76 Activator重复启动内置服务器、切换环境的支持 切换环境重启部分activator
|
7 years ago |
ju
|
05772f2448
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
ju
|
69eaddf7e5
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
切换环境重启部分activator
|
7 years ago |
superman
|
897b2cfe54
|
Merge pull request #95 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'd1bac490e2cbc8738fc432ac402c1f3c0ad932ae':
REPORT-8393 监听放后
|
7 years ago |
vito
|
d1bac490e2
|
REPORT-8393 监听放后
|
7 years ago |
superman
|
bea4123a61
|
Merge pull request #92 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'b4c2e8e05159264e5e81508791a85ad5c44e2340':
REPORT-8515 设计器启动速度优化,阿尔法范的searchtext注册放到独立线程处理
|
7 years ago |