2842 Commits (96c8994c49c7bed5dda399363c25b861b601712f)
 

Author SHA1 Message Date
superman 29e3a29168 Merge pull request #819 in BA/design from ~PLOUGH/design:release to release 8 years ago
plough 935b4fcca6 无JIRA任务;去掉调试信息 8 years ago
superman 8c5e96aaa3 Merge pull request #818 in BA/design from ~ZACK/design:master to master 8 years ago
zack 08069fbfe0 无JIRA任务 解决代码冲突 8 years ago
superman f981f8f59a Merge pull request #817 in BA/design from ~PAUL/design:master to master 8 years ago
paul 81e1e4ea8f Merge branch 'release' 8 years ago
superman 789f00bbb6 Merge pull request #816 in BA/design from ~ZACK/design:release to release 8 years ago
zack c247eeac6a 无JIRA任务 屏蔽新翻页 8 years ago
superman 5bf72652e4 Merge pull request #815 in BA/design from ~ZHENG/design:dev to dev 8 years ago
fr_shine 711ccb4b7f Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev 8 years ago
fr_shine 3471515bdd 一个小警告 8 years ago
superman 6a81ab2bfe Merge pull request #814 in BA/design from ~KERRY/design:release to release 8 years ago
kerry eb1e45d12a Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release 8 years ago
kerry be48bf4b29 REPORT-2220 8 years ago
superman da72d3d213 Merge pull request #813 in BA/design from ~MANGO/design:dev to dev 8 years ago
superman 264f742f47 Merge pull request #811 in BA/design from ~SYOKI/design:release to release 8 years ago
mengao 5f68195875 加上之前合并冲突被删掉的国际化 8 years ago
mengao 333fd83577 修改设计器最大最小值,与releas分支同步 8 years ago
superman 631c3c8e81 Merge pull request #812 in BA/design from ~MANGO/design:release to release 8 years ago
mengao 814bea2e11 修改 8 years ago
mengao 469bcc513d 修改代码 8 years ago
mengao 3a0894ea9e Merge remote-tracking branch 'origin/release' into release 8 years ago
mengao cc43c53143 修改最大最小值值定义,兼容vancharts插件 8 years ago
syoki 55ddfd87dc 国际化修改 部分未翻译字段翻译 庄奇 201704130221 8 years ago
superman 04f0fb00f2 Merge pull request #810 in BA/design from ~PLOUGH/design:release to release 8 years ago
plough 50dd30c362 REPORT-2344 国际化——繁体设计器少了key 8 years ago
superman 88bd7eeae5 Merge pull request #809 in BA/design from ~YAOH.WU/design_0407:release to release 8 years ago
yaoh.wu 76d1d2fc4a Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release 8 years ago
yaoh.wu 25116d6466 report-1945,tab|自适应,无组件时粘贴问题 8 years ago
superman ff07cc70aa Merge pull request #808 in BA/design from ~YAOH.WU/design_0407:release to release 8 years ago
yaoh.wu 03ae87935a report-1945 自适应无组件是粘贴失败修复 8 years ago
superman cccc769692 Merge pull request #807 in BA/design from ~ZHENG/design:dev to dev 8 years ago
fr_shine 48723cc220 合并代码或者修改冲突时 merge错误 改回正确的 8 years ago
superman 455c766b18 Merge pull request #806 in BA/design from ~YAOH.WU/design_0407:release to release 8 years ago
yaoh.wu 228d8bb8e8 组件复用层叠顺序新添加的组件在上方 8 years ago
yaoh.wu cc99e7d54f 无任务代码调整 8 years ago
yaoh.wu 6a9cec9bb3 report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题 8 years ago
yaoh.wu b67778a4de 无任务 代码调整 8 years ago
superman 6190eb5ca7 Merge pull request #805 in BA/design from ~SYOKI/design:release to release 8 years ago
superman e0849e8a22 Merge pull request #804 in BA/design from ~ZHENG/design:dev to dev 8 years ago
syoki 9d5bdf6f59 国际化修改 design部分 庄奇 201704110018 8 years ago
fr_shine 8500d81bb5 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev 8 years ago
yaoh.wu c0b8ac950d Merging in latest from upstream (BA/design:refs/heads/dev) 8 years ago
superman 79ade6642c Merge pull request #803 in BA/design from ~NEIL/design:dev to dev 8 years ago
neil 9dd806a40f 无JIRA任务, 冲突修正 8 years ago
yaoh.wu 380465ed6c Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev 8 years ago
yaoh.wu 40dbc0272f report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题 8 years ago
superman 55dc340af3 Merge pull request #801 in BA/design from ~ZHOUPING/design:release to release 8 years ago
superman 75a3186262 Merge pull request #802 in BA/design from ~NEIL/design:master to dev 8 years ago
neil d8daeae404 ct 8 years ago