Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • a35a6071c1 update Fangjie Hu 2016-09-08 15:54:44 +0800
  • 3e829c5bcb Merge pull request #315 in BA/design from ~XIAOHU/design:dev to dev superman 2016-09-08 15:28:58 +0800
  • 7edde71755 Merge pull request #316 in BA/design from ~LEE/design:dev to dev superman 2016-09-08 15:14:06 +0800
  • f2b273c1b6 改一下写法，添加一些返回值为error的判断处理 李攀 2016-09-08 14:41:26 +0800
  • 7ddb70db29 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev Fangjie Hu 2016-09-08 13:59:57 +0800
  • f4cf187132 国际化 Fangjie Hu 2016-09-08 13:59:43 +0800
  • c4cdc43edc Merge pull request #314 in BA/design from ~RICHIE/design:master to master richie 2016-09-08 09:41:36 +0800
  • 82b033e7f3 Merge remote-tracking branch 'origin/master' richie 2016-09-08 09:39:00 +0800
  • b9c1e4ec9a 工具栏 richie 2016-09-08 09:38:25 +0800
  • 8f3905099c Merge pull request #313 in BA/design from ~RICHIE/design:master to master richie 2016-09-08 09:33:51 +0800
  • 00e778f1c1 工具栏 richie 2016-09-08 09:31:25 +0800
  • 953ee859c4 工具栏接口 richie 2016-09-08 09:27:08 +0800
  • 71150e11fc Merge pull request #312 in BA/design from ~LEE/design:dev to dev superman 2016-09-08 08:39:54 +0800
  • ba40379e97 QQ授权切换账号的时候的confirm用javafx重新获取，重写处理 李攀 2016-09-07 21:00:41 +0800
  • 90c87ffcdd Merge pull request #311 in BA/design from ~LOY/design_fr:dev to dev superman 2016-09-07 17:02:52 +0800
  • 19541e82cc Merge pull request #306 in BA/design from ~XIAOHU/design:dev to dev superman 2016-09-07 16:58:23 +0800
  • 88dc3a8fe7 Merge branch 'dev' of ssh://www.finedevelop.com:7999/~loy/design_fr into dev loy 2016-09-07 14:19:43 +0800
  • 8a39df10d3 优化web报表性能，增加轻量重方式输出选项 loy 2016-09-07 14:19:17 +0800
  • d41739348e Merge pull request #310 in BA/design from ~ZHOUPING/design:master to master superman 2016-09-07 11:13:57 +0800
  • cf723aa047 toolKit放到xwabsolute中 zhouping 2016-09-07 11:08:31 +0800
  • b5502d16c1 update Fangjie Hu 2016-09-07 10:55:14 +0800
  • 4ebbd2a495 update Fangjie Hu 2016-09-07 09:56:10 +0800
  • 104f8b93ef update Fangjie Hu 2016-09-06 11:21:01 +0800
  • 79e9bcf250 update Fangjie Hu 2016-09-06 09:49:22 +0800
  • 95e7ef79ad Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev Fangjie Hu 2016-09-06 00:22:40 +0800
  • 575df71859 update Fangjie Hu 2016-09-05 18:59:02 +0800
  • 403f2edf66 update Fangjie Hu 2016-09-05 18:16:07 +0800
  • 84127e8dbe update Fangjie Hu 2016-09-05 18:10:37 +0800
  • 05252c0031 插件依赖 Fangjie Hu 2016-09-05 16:24:34 +0800
  • b43d208668 下载依赖的通道 Fangjie Hu 2016-09-05 14:28:11 +0800
  • e1378cc9ae Merge pull request #307 in BA/design from ~LEE/design:dev to dev superman 2016-09-05 08:37:33 +0800
  • 845cfd0527 bugfix：注册地址调整 李攀 2016-09-03 19:21:48 +0800
  • 0b3e655c5c update Fangjie Hu 2016-09-03 12:49:57 +0800
  • 1b4faadc66 update Fangjie Hu 2016-09-03 12:14:08 +0800
  • 7f6b2b2594 插件依赖 Fangjie Hu 2016-09-03 11:17:43 +0800
  • 552ba157b8 update Fangjie Hu 2016-09-02 16:07:17 +0800
  • a03576374d update Fangjie Hu 2016-09-02 16:05:58 +0800
  • 8e0c66149a 从配置文件中控制是否需要检测插件依赖环境 Fangjie Hu 2016-09-02 15:59:42 +0800
  • a716f9d415 Merge pull request #305 in BA/design from ~NEIL/design:master to master superman 2016-09-02 14:28:44 +0800
  • 27f554cb8c 冲突修正 neil 2016-09-02 14:26:07 +0800
  • 389ad31bb2 Merge pull request #304 in BA/design from ~NEIL/design:release to master superman 2016-09-02 13:52:06 +0800
  • 4883e89a3c 冲突 neil 2016-09-02 11:37:42 +0800
  • 310c690175 Merge pull request #302 in BA/design from ~LEE/design:dev to dev superman 2016-09-02 09:39:43 +0800
  • e920c7757a bugfix：QQ授权页面超链问题；插件管理内登录问题 李攀 2016-09-01 21:39:13 +0800
  • 0cd719303f update Fangjie Hu 2016-09-01 17:43:01 +0800
  • 8f50359954 phantomjs Fangjie Hu 2016-09-01 17:26:14 +0800
  • b916d352b3 phantomjs Fangjie Hu 2016-09-01 17:25:23 +0800
  • 289dcdfae2 update Fangjie Hu 2016-09-01 15:02:25 +0800
  • dfa8ef6c53 update Fangjie Hu 2016-09-01 15:00:42 +0800
  • 59cc6264ba update Fangjie Hu 2016-09-01 14:32:53 +0800
  • cf670ae8e6 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~harry/design into dev Fangjie Hu 2016-09-01 14:30:06 +0800
  • 9d57c1a74d 准备插件资源 Fangjie Hu 2016-09-01 14:29:53 +0800
  • df4b44482f Merge pull request #300 in BA/design from ~ZACK/design:dev to dev superman 2016-09-01 11:19:20 +0800
  • 7ad6966590 补个注释 zack 2016-09-01 10:58:55 +0800
  • 0d2ad44641 填报校验信息支持公式，把前面的条件框也改成公式编辑 zack 2016-09-01 10:54:08 +0800
  • ab41d851d0 Merge pull request #299 in BA/design from ~RICHIE/design:dev to dev superman 2016-08-31 17:33:42 +0800
  • 4ecfc1c926 某些菜单接口开放 richie 2016-08-31 15:57:02 +0800
  • c61ac43a4a Merge pull request #298 in BA/design from ~LEE/design:dev to dev superman 2016-08-31 14:57:00 +0800
  • 169782b7b1 修复 李攀 2016-08-31 14:10:51 +0800
  • 0f670e4aba 修改 李攀 2016-08-31 13:31:26 +0800
  • c772852a9c 格式修改 李攀 2016-08-30 17:44:32 +0800
  • 8d9d23c992 Merge pull request #295 in BA/design from ~ZHOUPING/design:dev to dev superman 2016-08-30 16:32:27 +0800
  • 084052d0e9 Merge pull request #296 in BA/design from ~ZHOUPING/design:release to release superman 2016-08-30 16:32:24 +0800
  • ef02774826 Merge pull request #294 in BA/design from ~DANIEL/finereport_design:dev to dev superman 2016-08-30 16:24:15 +0800
  • 444446ad05 绝对布局bug修改3 zhouping 2016-08-30 16:21:36 +0800
  • 9819153f45 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev zhouping 2016-08-30 16:19:48 +0800
  • f264ccda89 绝对布局bug修改3 zhouping 2016-08-30 16:19:36 +0800
  • cdb5e7515c Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev daniel 2016-08-30 15:46:55 +0800
  • 74152de997 1 daniel 2016-08-30 15:46:50 +0800
  • 5053d18375 Merge pull request #292 in BA/design from ~ZHOUPING/design:dev to dev superman 2016-08-30 11:04:47 +0800
  • 55cdd4d42b Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev zhouping 2016-08-30 10:59:37 +0800
  • f468fc4491 bug:103653 zhouping 2016-08-30 10:59:27 +0800
  • f0ff820251 Merge pull request #291 in BA/design from ~ZACK/design:dev to dev superman 2016-08-29 20:01:35 +0800
  • 52af1da903 bug103155,tab布局的重命名功能先屏蔽了 zack 2016-08-29 19:04:18 +0800
  • 4a09ba2985 更改依赖范围 sunmondong 2016-08-29 18:08:06 +0800
  • 59a3e8f7be 更改依赖范围 sunmondong 2016-08-29 18:07:17 +0800
  • 9437dbd7a1 更改依赖范围 sunmondong 2016-08-29 18:06:33 +0800
  • 49b3b70a74 再次缩小依赖范围 sunmondong 2016-08-29 17:39:08 +0800
  • 05fa04516b 缩小依赖范围 sunmondong 2016-08-29 17:38:14 +0800
  • d6788f0f0a 缩小依赖范围 sunmondong 2016-08-29 17:35:55 +0800
  • be94670f8c 缩小依赖范围 sunmondong 2016-08-29 17:30:26 +0800
  • 545018032d Merge pull request #290 in BA/design from ~XIAOHU/design:dev to dev superman 2016-08-29 16:45:33 +0800
  • 47bc18354d Merge pull request #289 in BA/design from ~ZHOUPING/design:release to release superman 2016-08-29 14:56:20 +0800
  • 05e4fc08cd 表单画图 Fangjie Hu 2016-08-29 14:38:31 +0800
  • 4c3b74469f release分支，工具栏上屏蔽绝对布局 zhouping 2016-08-29 13:39:24 +0800
  • 89ce432aaa 回退 kerry 2016-08-29 10:05:35 +0800
  • a8c5aff27f Merge pull request #288 in BA/design from ~ZHOUPING/design:dev to dev superman 2016-08-29 09:04:26 +0800
  • de754516cc 绝对布局测试bug修改2 zhouping 2016-08-29 00:18:13 +0800
  • 7dbe35bb7a 添加一个在安装插件时做的其他操作接口 kerry 2016-08-27 09:32:11 +0800
  • 61949f043e Merge pull request #284 in BA/design from ~DANIEL/finereport_design:dev to dev superman 2016-08-26 09:28:15 +0800
  • 7658203829 import错误 daniel 2016-08-26 08:45:20 +0800
  • 10282b4738 Merge pull request #283 in BA/design from ~ZHOUPING/design:dev to dev superman 2016-08-25 10:08:56 +0800
  • a2fff63ec8 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev zhouping 2016-08-24 21:37:23 +0800
  • a912c11d73 绝对布局内部组件增加边缘中心的对齐线 zhouping 2016-08-24 21:37:10 +0800
  • 0e293a4d07 Merge pull request #282 in BA/design from ~RICHIE/design:dev to dev superman 2016-08-24 11:07:26 +0800
  • ce63bb1472 Merge pull request #280 in BA/design from ~LOY/design_fr:dev to dev superman 2016-08-24 10:44:41 +0800
  • ab64142fb0 删除所有的配置文件,统一放到project中 richie 2016-08-24 10:37:14 +0800
  • dfffd72616 Merge pull request #281 in BA/design from ~ZHOUPING/design:dev to dev superman 2016-08-24 09:47:07 +0800
  • d1af504ea6 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev zhouping 2016-08-23 21:36:20 +0800
  • b54655f286 绝对布局bug修改1 zhouping 2016-08-23 21:36:07 +0800