zheng
|
74485a2dfc
|
Merge branch 'feature/10.0' of http://www.cloud.finedevelop.com:2015/scm/~zheng/C-design into feature/10.0
|
7 years ago |
|
zheng
|
1ed01bae03
|
类型界面开接口
|
7 years ago |
|
zheng
|
08a74da8d5
|
CHART-2216 空间 光照 dierta0.1 阻塞
|
7 years ago |
superman
|
b30b76c1fe
|
Merge pull request #23 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'a52503737ad60ac7808b34ddc2ac1cdd31ea85ef':
无jira任务 10.0设计器调试启动问题，设置环境需要在设置buildfile之后
|
7 years ago |
vito
|
a52503737a
|
无jira任务 10.0设计器调试启动问题，设置环境需要在设置buildfile之后
|
7 years ago |
|
superman
|
c3f8b9ac90
|
Merge pull request #22 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '8464d75a372b357f6ea0e6e14dcc0a1343c7a985':
REPORT-7707 【10.0集群一轮】工具栏上的图标都没了 顺便改几个bug
|
7 years ago |
ju
|
8464d75a37
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
|
ju
|
f094c9f299
|
REPORT-7707 【10.0集群一轮】工具栏上的图标都没了
顺便改几个bug
|
7 years ago |
|
superman
|
99362d066d
|
Merge pull request #21 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4777f44fb372da892dc1451de2cdce2c9f805094':
REPORT-7707 【10.0集群一轮】工具栏上的图标都没了 顺便改几个bug
|
7 years ago |
|
ju
|
4777f44fb3
|
REPORT-7707 【10.0集群一轮】工具栏上的图标都没了
顺便改几个bug
|
7 years ago |
|
superman
|
42981a0b5e
|
Merge pull request #20 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'bd2a7e51ffee477b925aa119677f4ee5fcacd06c':
无JIRA任务 启动顺序
|
7 years ago |
|
ju
|
bd2a7e51ff
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
|
ju
|
7393027f4d
|
无JIRA任务 启动顺序
|
7 years ago |
|
superman
|
09cc4fb0f1
|
Merge pull request #19 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit '48b0e25fbf0224edac1d0cb70fde4e746738b8da':
REPORT-7689 预定义页面没办法换到文本格式
|
7 years ago |
zack
|
48b0e25fbf
|
REPORT-7689 预定义页面没办法换到文本格式
|
7 years ago |
|
superman
|
66868ef2ef
|
Merge pull request #18 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'e30cc7581b9cebe115c0f93cb3e9ce48453a3e7f':
REPORT-7500 【10.0一轮迭代】10.0 exe内置tomcat编码方式需要修改为UTF-8
|
7 years ago |
kerry
|
e30cc7581b
|
REPORT-7500 【10.0一轮迭代】10.0 exe内置tomcat编码方式需要修改为UTF-8
|
7 years ago |
|
superman
|
f0bb3399c9
|
Merge pull request #17 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit 'cd3b268f4ade5d2d015530ce03fd358243d9c67c':
CORE-72 代码质量
|
7 years ago |
richie
|
cd3b268f4a
|
CORE-72 代码质量
|
7 years ago |
|
superman
|
4e7c15b0b4
|
Merge pull request #16 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '69ba1e5585dbbef134c9c3c993cb15b21e6fa6ea':
Report-7221 先还原回去
|
7 years ago |
|
kerry
|
69ba1e5585
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
|
kerry
|
4ad692867b
|
Report-7221 先还原回去
|
7 years ago |
|
superman
|
81500c1755
|
Merge pull request #15 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'cc8470f8810e88605121b5cf4ad2876f1fe4c316':
update
disable add button not whole button pan
整理一波assets/map assist/phantomjs
CHART-2109
|
7 years ago |
|
zheng
|
cc8470f881
|
update
|
7 years ago |
|
zheng
|
b1bf6aac1d
|
disable add button not whole button pan
|
7 years ago |
|
zheng
|
7bce2c1ce3
|
整理一波assets/map assist/phantomjs
|
7 years ago |
|
zheng
|
e62303e29b
|
Merge branch 'feature/10.0' of http://www.cloud.finedevelop.com:2015/scm/~zheng/C-design into feature/10.0
|
7 years ago |
|
zheng
|
43528c866f
|
CHART-2109
|
7 years ago |
|
superman
|
8560095f34
|
Merge pull request #14 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '7903c2fa4af3edde2e77d192c09680861f64c1e8':
REPORT-7221 from momeak 【10.0一轮迭代】设计器中报表平台管理，点进去url不对
|
7 years ago |
|
kerry
|
7903c2fa4a
|
REPORT-7221 from momeak 【10.0一轮迭代】设计器中报表平台管理，点进去url不对
|
7 years ago |
|
superman
|
b370a4c9cc
|
Merge pull request #13 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'ad0d512818362a85274f90e7005c95811c0ae5fc':
CHART-2100 bug
|
7 years ago |
|
zheng
|
ad0d512818
|
Merge branch 'feature/10.0' of http://www.cloud.finedevelop.com:2015/scm/~zheng/C-design into feature/10.0
|
7 years ago |
|
zheng
|
9fd31ccc8c
|
CHART-2100 bug
|
7 years ago |
|
superman
|
faf0f1049f
|
Merge pull request #12 in DESIGN/design from ~NEIL/design_n:feature/10.0 to feature/10.0
* commit 'ea372294ca583add5d3f2ae4b93e60b2376141fe':
无JIRA任务，加个锁
|
7 years ago |
 neil
|
ea372294ca
|
无JIRA任务，加个锁
|
7 years ago |
|
superman
|
26c0cbbfa1
|
Merge pull request #11 in DESIGN/design from ~NEIL/design_n:feature/10.0 to feature/10.0
* commit '6ac14265040044612ad460835ce1eaf331cc893d':
REPORT-7517 国际化移动到i18n
|
7 years ago |
|
neil
|
6ac1426504
|
REPORT-7517 国际化移动到i18n
|
7 years ago |
|
superman
|
63b320af32
|
Merge pull request #10 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '0186c84ddd25d4eb08318451bc235b70611cf129':
无JIRA任务 国际化规范
|
7 years ago |
 richie
|
0186c84ddd
|
无JIRA任务 国际化规范
|
7 years ago |
|
superman
|
dd6ebc1c11
|
Merge pull request #8 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '329079ff0d3e5fb240e00e0abda2e03f012086e5':
plugin.chart to van.chart 不容易啊 idea卡死两次
代码质量
CHART-2099 大屏图表
CHART-2006
|
7 years ago |
|
zheng
|
329079ff0d
|
plugin.chart to van.chart 不容易啊 idea卡死两次
|
7 years ago |
|
zheng
|
10b104909c
|
代码质量
|
7 years ago |
|
zheng
|
3218a8b6cf
|
CHART-2099 大屏图表
|
7 years ago |
|
superman
|
5984377f34
|
Merge pull request #7 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'e9a5d6c924f8abba817b600a82ca521ccbd0b2eb':
无JIRA任务 删除老的集群代码
|
7 years ago |
|
ju
|
e9a5d6c924
|
无JIRA任务 删除老的集群代码
|
7 years ago |
|
superman
|
eccdc74290
|
Merge pull request #6 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'ed61905a68d9dd15f905a5d95d68e08d79c6465d':
无JIRA任务 删除老的集群代码
|
7 years ago |
|
ju
|
ed61905a68
|
无JIRA任务 删除老的集群代码
|
7 years ago |
|
zheng
|
dc71ac9584
|
CHART-2006
|
7 years ago |
|
superman
|
468328352a
|
Merge pull request #5 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '4f8623d081eb558abd1d1454cf43e57cf99562e5':
CHART-2006 图表插件接口整理
|
7 years ago |
|
zheng
|
4f8623d081
|
Merge branch 'feature/10.0' of http://www.cloud.finedevelop.com:2015/scm/~zheng/C-design into feature/10.0
|
7 years ago |
