1931 Commits (60b0df7960b528da5416127c3271e51f2373f4c2)
 

Author SHA1 Message Date
daniel 60b0df7960 Merging in latest from upstream (BA/design:refs/heads/dev) 8 years ago
superman e956d3a9c0 Merge pull request #617 in BA/design from ~FANGLEI/design:dev to dev 8 years ago
fanglei 42cb8251b6 界面按钮顺序修改了,预览图片的顺序也要相应修改 8 years ago
fanglei b22d2c17bf Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev 8 years ago
fanglei 84518414e4 调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序 8 years ago
superman 1bc77c53cb Merge pull request #616 in BA/design from ~FANGLEI/design:dev to dev 8 years ago
fanglei c713d82b89 解决国际化文件冲突之后“app”忘记去掉 8 years ago
fanglei 27c3deb5dc Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev 8 years ago
fanglei 276a06350e 增加了移动端属性->双向自适应选项 8 years ago
superman 31364316b0 Merge pull request #615 in BA/design from ~XIAOXIA/design:dev to dev 8 years ago
xiaoxia efda5a486f rt 8 years ago
superman 1b072d22dc Merge pull request #7 in PF/design from ~RINOUX/design:dev to dev 8 years ago
rinoux 757e6e4d2b Merging in latest from upstream (PF/design:refs/heads/dev) 8 years ago
xiaoxia 57ebd42fcb rt 8 years ago
xiaoxia 9309c76f1a oracle 存储过程问题 8 years ago
superman 6612dc8862 Merge pull request #610 in BA/design from ~KERRY/design:dev to dev 8 years ago
superman c69102453c Merge pull request #611 in BA/design from ~JU/1-ba-design:dev to dev 8 years ago
juhaoyu 35782fcac1 修改判断逻辑 8 years ago
juhaoyu be6f8a80d6 将Closeable的判断等事情放到专门的容器中 8 years ago
juhaoyu 3a948e4f9a 将Closeable的判断等事情放到专门的容器中 8 years ago
kerry 993abf5ab5 修改PMD中的问题 8 years ago
juhaoyu d982955398 保证获取不到已经禁用了的图表插件实例 8 years ago
juhaoyu d9b634132b 保证获取不到已经禁用了的图表插件实例 8 years ago
kerry c805bc3410 REPORT-1138 模板消息事件 8 years ago
juhaoyu ea087d4845 保证获取不到已经禁用了的图表插件实例 8 years ago
fanglei 41191d8024 解决冲突 8 years ago
fanglei e02cc5be56 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev 8 years ago
fanglei 4ded7b5fec 将“app自适应”改成“自适应” 8 years ago
juhaoyu 6cba2e4318 保证获取不到已经禁用了的图表插件实例 8 years ago
rinoux 039cc56c5d Merging in latest from upstream (PF/design:refs/heads/dev) 8 years ago
superman 8d1afe6a94 Merge pull request #608 in BA/design from PF/design:dev to dev 8 years ago
daniel f3240ee6f9 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev 8 years ago
daniel 3de2580ad6 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev 8 years ago
superman 20ba29667a Merge pull request #606 in BA/design from ~PLOUGH/design:dev to dev 8 years ago
daniel 6d663e290e Merging in latest from upstream (BA/design:refs/heads/dev) 8 years ago
plough af009c3c78 无JIRA任务。调整代码。 8 years ago
plough 35198fa0d9 REPORT-1096 不继承UIButton 8 years ago
plough f2d5c68c8e 无JIRA任务。调整代码。 8 years ago
plough c807101e9d 无JIRA任务。整理代码 8 years ago
plough d998b8524c REPORT-1096 在“纸张背景”窗口中增加取色器按钮 8 years ago
plough b828b89a46 REPORT-1096 自定义界面的颜色随鼠标位置动态变化;修改取色框的UI 8 years ago
plough cc5d8edec9 REPORT-1096 完成基本功能 8 years ago
plough 87b8d6266c 无JIRA任务,给CustomChooserPanel.java 调整缩进 8 years ago
plough d0cd522b79 REPORT-1096 将取色按钮封装为一个类 8 years ago
plough 85a6a6076d REPORT-1096 实现第一个界面(下拉颜色选择框)里的取色器功能 8 years ago
superman e3b3cabc60 Merge pull request #604 in BA/design from ~LEE/design_master:dev to dev 8 years ago
PanLi320 2b2b3b217a REPORT-1287 属性返回数组代码问题 8 years ago
daniel c982f8db6a Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev 8 years ago
superman 320c83d7b5 Merge pull request #6 in PF/design from ~DANIEL/finereport_design:dev to dev 8 years ago
superman 2008f06d62 Merge pull request #603 in BA/design from ~FANGLEI/design:dev to dev 8 years ago