Commit Graph

  • 67fb26b0be druid spring调整 daniel 2018-06-29 11:20:31 +0800
  • 40f56edc41 Merge pull request #68 in CORE/base-third from feature/10.0 to release/10.0 richie 2018-06-26 15:19:05 +0800
  • d4faba1068 bytebudy的agent richie 2018-06-26 15:17:38 +0800
  • 31fc325a71 Merge pull request #67 in CORE/base-third from ~ABEL.CHEN/base-third:feature/10.0 to feature/10.0 abel.chen 2018-06-19 10:46:36 +0800
  • 3112e185be delete jar abel.chen 2018-06-19 10:37:17 +0800
  • 54326eb2b1 fix gradle abel.chen 2018-06-19 10:36:20 +0800
  • dce7cfa68b cpu监控根据jre版本选择不同的实现 abel.chen 2018-06-18 19:04:38 +0800
  • 62a147a9c0 Merge pull request #66 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 neil 2018-06-14 08:58:17 +0800
  • 756d79c662 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-06-13 10:41:10 +0800
  • dcd394c171 REPORT-8178 chunk的宽度计算偏差问题 kerry 2018-06-13 10:40:59 +0800
  • 7222b87649 Merge pull request #65 in CORE/base-third from feature/10.0 to release/10.0 richie 2018-06-12 16:47:13 +0800
  • 0c5583bfbc Merge pull request #64 in CORE/base-third from ~DANIEL/base-third:feature/10.0 to feature/10.0 daniel 2018-06-12 16:03:22 +0800
  • a4dd7ba81b Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~daniel/base-third into feature/10.0 daniel 2018-06-12 15:55:02 +0800
  • 33f9c810cc build daniel 2018-06-12 15:54:54 +0800
  • 0efba91c82 Merge pull request #63 in CORE/base-third from ~DANIEL/base-third:feature/10.0 to feature/10.0 richie 2018-06-12 12:06:14 +0800
  • c744164ba2 build daniel 2018-06-12 12:04:07 +0800
  • 8bb993d436 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~daniel/base-third into feature/10.0 daniel 2018-06-12 12:00:06 +0800
  • a1651ba3e7 build daniel 2018-06-12 11:59:59 +0800
  • 666f9a1345 Merge pull request #62 in CORE/base-third from ~DANIEL/base-third:feature/10.0 to feature/10.0 daniel 2018-06-12 11:39:32 +0800
  • 01fa9e0f23 build daniel 2018-06-12 11:32:18 +0800
  • 1a7eda13be build daniel 2018-06-12 11:26:16 +0800
  • a16a3bf1f4 Merge pull request #61 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-06-07 12:13:12 +0800
  • 233868a10a Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-06-07 11:58:10 +0800
  • a7b707fc32 REPORT-8403 这边用其他方式获取宽度 kerry 2018-06-07 11:57:23 +0800
  • 7283a30e3d Merge pull request #60 in CORE/base-third from ~JU/base-third:feature/10.0 to feature/10.0 superman 2018-06-07 11:46:50 +0800
  • 337498b9f1 Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0 ju 2018-06-07 11:44:07 +0800
  • d8b70ea8c8 CORE-76 Activator重复启动内置服务器、切换环境的支持 切环境时要关闭socketio,等待的话影响比较大 ju 2018-06-07 11:43:45 +0800
  • ba9173f856 Merge pull request #59 in CORE/base-third from ~HZZZ/base-third61:feature/10.0 to feature/10.0 superman 2018-06-06 12:30:02 +0800
  • e0dbb1e038 Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/base-third61 into feature/10.0 hzzz 2018-06-06 12:15:40 +0800
  • d5fc12be29 没删干净 hzzz 2018-06-06 12:15:35 +0800
  • eb35367ce2 Merge pull request #58 in CORE/base-third from ~HZZZ/base-third61:feature/10.0 to feature/10.0 superman 2018-06-06 09:02:47 +0800
  • 8cdc66fbad . hzzz 2018-06-06 00:11:44 +0800
  • 254487feb5 . hzzz 2018-06-06 00:10:16 +0800
  • 50714fc740 rm portlet hzzz 2018-06-06 00:02:28 +0800
  • 242106d640 rm portlet hzzz 2018-06-06 00:02:05 +0800
  • 74cd22aebe rm portlet hzzz 2018-06-06 00:01:54 +0800
  • 9a483a2037 Merge pull request #57 in CORE/base-third from ~HZZZ/base-third61:feature/10.0 to feature/10.0 superman 2018-06-05 23:29:10 +0800
  • 7247dee30b fix hzzz 2018-06-05 23:24:47 +0800
  • 8399a7ce94 fix hzzz 2018-06-05 23:24:14 +0800
  • de3e0a1d9e fix hzzz 2018-06-05 23:24:06 +0800
  • 4b1993ead0 移除portalet richie 2018-06-05 23:10:48 +0800
  • 266e86bb68 kryo序列化 richie 2018-06-05 20:15:34 +0800
  • a649bf8504 源码 richie 2018-06-05 19:08:15 +0800
  • f7ae5ad7cd Merge pull request #56 in CORE/base-third from ~HZZZ/base-third61:feature/10.0 to feature/10.0 superman 2018-06-05 19:07:09 +0800
  • 8282108423 fix hzzz 2018-06-05 18:40:18 +0800
  • ef9b8b3f76 忘记改包名 richie 2018-06-05 18:25:17 +0800
  • a6c18a8b36 apache lang3和collection4编译 richie 2018-06-05 18:19:15 +0800
  • 628bd6e673 ant hzzz 2018-06-05 17:25:26 +0800
  • 032bb48c78 fix hzzz 2018-06-05 17:21:21 +0800
  • d6b90aa603 rm .. hzzz 2018-06-05 17:06:10 +0800
  • 08c1a30d90 添加apache/commons-fileupload hzzz 2018-06-05 17:02:49 +0800
  • 9262e93119 Merge pull request #55 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-06-04 13:49:09 +0800
  • 1840daa739 REPORT-8403 10.0html解析之list标签打印导出空白 kerry 2018-06-04 13:43:56 +0800
  • 50392d934a Merge pull request #53 in CORE/base-third from release/9.0 to master superman 2018-05-30 15:02:16 +0800
  • f0ac2f9990 Merge pull request #52 in CORE/base-third from ~KRIS/base-third:feature/10.0 to feature/10.0 superman 2018-05-30 14:02:31 +0800
  • 126a3154d9 BI-22863 third包中ehcahe 类无法加载问题处理 kris 2018-05-30 13:49:50 +0800
  • 80f7f62310 Merge pull request #51 in CORE/base-third from ~PONY/base-third:release/9.0 to release/9.0 superman 2018-05-24 18:51:32 +0800
  • 209e745852 改用logger pony 2018-05-24 17:34:47 +0800
  • 10dd8cad2c BI-22377 druid加上-DfrDruidLogActiveCount=true可打印activecount的堆栈 pony 2018-05-24 17:17:19 +0800
  • 007c863c26 Merge pull request #50 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0 superman 2018-05-22 11:01:38 +0800
  • 5f03c9ba90 fix Zed 2018-05-22 10:52:25 +0800
  • 237812cee1 无jira任务,aspectj单独作为一个模块 Zed 2018-05-22 10:44:39 +0800
  • 922e1237e5 降级4.0.29 richie 2018-05-21 19:48:55 +0800
  • 173be4ff2d ignore richie 2018-05-21 19:39:48 +0800
  • 2d0e8f0777 去掉了压缩代码,适配netty-4.0.29 richie 2018-05-21 19:38:49 +0800
  • 26e2863f15 Merge pull request #49 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0 superman 2018-05-21 18:58:38 +0800
  • b1c11d436d 无jira任务,spring aop相关代码打进third Zed 2018-05-21 18:55:23 +0800
  • 460c7f7de8 Merge pull request #47 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-05-18 14:15:59 +0800
  • 1ba39be6fb Merge pull request #48 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0 superman 2018-05-18 14:15:31 +0800
  • 373e7b544b DEC-1972 配置了log4j的时候定时任务启动抛错处理掉 Zed 2018-05-18 13:32:52 +0800
  • 17c2807732 REPORT-6702 添加margin和padding属性解析 kerry 2018-05-18 12:01:18 +0800
  • 9c8cc0d904 Merge pull request #46 in CORE/base-third from release/9.0 to master superman 2018-05-16 14:02:09 +0800
  • a6541a5578 Merge pull request #45 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-05-11 15:37:14 +0800
  • 5f5418e6f2 无jira任务,打包失败 kerry 2018-05-11 15:24:28 +0800
  • ee41bf2704 Merge pull request #44 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-05-11 12:51:05 +0800
  • 6619d84f6f kerry 2018-05-11 11:10:09 +0800
  • 58bc1ffc06 REPORT-8032 && REPORT-7875 && REPORT-8030 && REPORT-7873 base64img解析,style基本样式和上下标解析 kerry 2018-05-11 11:09:17 +0800
  • cc5f1c5f90 Merge pull request #43 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-05-07 10:49:18 +0800
  • 088b8f06c2 REPORT-7872 && REPORT-7874 && REPORT-7584 html解析之文字抗锯齿;解析 文字 加粗 颜色 背景 无效;html背景图形, 打印出来发现没有铺满单元格, 只有文字部分有背景 kerry 2018-05-07 10:37:35 +0800
  • a1b2a64133 Merge pull request #42 in CORE/base-third from ~QIAOZHI/base-third:master to master superman 2018-05-03 17:25:06 +0800
  • 971d8db03a odps用户名为空报错死循环 Qiaozhi 2018-05-03 17:20:12 +0800
  • 18ef567d34 Merge pull request #41 in CORE/base-third from ~QIAOZHI/base-third:release/9.0 to release/9.0 superman 2018-05-03 16:31:55 +0800
  • 5fc2a6a3ce odps报错死循环 Qiaozhi 2018-05-03 16:29:35 +0800
  • bd3bd7a33c Merge pull request #40 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-04-16 18:47:01 +0800
  • 33f7b81620 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-04-16 18:30:31 +0800
  • 1b4d525eda 无jira任务,单元测试失败 kerry 2018-04-16 18:30:25 +0800
  • 9d846c6b26 Merge pull request #39 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-04-16 09:54:05 +0800
  • 8302d9d0c2 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-04-16 09:51:16 +0800
  • f989f4922e REPORT-7481 && REPORT-7480 html解析之IMG标签;html解析之分页断开 kerry 2018-04-16 09:51:08 +0800
  • 7c7749722d 增加标准化路径 richie 2018-04-14 18:04:02 +0800
  • 6d24a198e1 jdk1.6 richie 2018-04-14 17:47:37 +0800
  • 190e94fc4f 集成commons-io richie 2018-04-14 16:50:29 +0800
  • 1faaa753c2 Merge pull request #38 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-04-12 15:11:58 +0800
  • 9a0511497a Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-04-12 14:56:42 +0800
  • a525849a9d REPORT-7480 html解析之分页断开 kerry 2018-04-12 14:56:31 +0800
  • 3b4119fd1b Merge pull request #37 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-04-11 10:15:41 +0800
  • bc0cf5d67a Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-04-11 10:14:52 +0800
  • be028e4279 REPORT-6702 构建文件修改 kerry 2018-04-11 10:14:46 +0800
  • 0fed108820 Merge pull request #36 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 superman 2018-04-11 10:01:21 +0800
  • c183c9bbd7 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-04-11 09:56:29 +0800