Commit Graph
3382 Commits
Author SHA1 Message Date
wenshao 2d7376bb06 remove StatTest 2013-07-15 16:03:06 +08:00
wenshao 0b7fb95430 Merge remote-tracking branch 'upstream/master' 2013-07-15 15:51:50 +08:00
温高铁 f11f77aa9f Merge pull request #391 from shrekwang/master
解决firefox浏览器下, 导航条不显示的问题
2013-07-15 00:50:53 -07:00
wenshao 7129ff5839 StatSchema support DropIndex 2013-07-15 15:49:14 +08:00
shrek.wang 3b82f9315c fix head navigation bar not show up problem in firefox browser 2013-07-15 15:35:38 +08:00
wenshao 16cc1ef545 Merge branch 'master' of https://github.com/wenshao/druid 2013-07-15 15:14:40 +08:00
wenshao 9c86d3f37b bug fixed for IPV6 2013-07-15 15:14:22 +08:00
wenshao 08fbb1030a remove log 2013-07-12 19:31:53 +08:00
温高铁 c17e4b57df Merge pull request #387 from yunnysunny/master
监控解密的小改动
2013-07-11 19:13:39 -07:00
wenshao f657c5f099 add LOG.error, if minEvictableIdleTimeMillis less than 30000. 2013-07-10 10:17:52 +08:00
高阳 2c30681433 Merge branch 'master' of https://github.com/alibaba/druid 2013-07-09 22:17:57 +08:00
高阳 4b836ddc47 deleted some code that not used.
corrected the menu's index in some page.
2013-07-09 22:16:37 +08:00
温高铁 8b30fa40c1 Merge pull request #386 from pathfinder-name/branches/jta
support pinGlobalTxToPhysicalConnection setting.
2013-07-09 04:33:48 -07:00
wenshao 759fda6312 add testcase & improve LogFilter support multi-datasource 2013-07-09 17:39:55 +08:00
wenshao fe04feb3a7 Merge branch 'master' of https://github.com/wenshao/druid 2013-07-08 21:16:19 +08:00
wenshao 7faf9c99e2 Merge remote-tracking branch 'upstream/master' 2013-07-08 18:26:10 +08:00
wenshao b923c17cd9 Merge remote-tracking branch 'upstream/master' 2013-07-08 18:25:56 +08:00
wenshao bee5912593 bug fixed for sql.json none id 2013-07-08 18:23:02 +08:00
wenshao d588448c4f Merge branch 'master' of https://github.com/wenshao/druid 2013-07-08 18:22:32 +08:00
温高铁 d2c82c5331 Merge pull request #385 from yunnysunny/master
版本库版本号更新
2013-07-04 18:29:51 -07:00
高阳 4c00a6b658 Merge branch 'master' of https://github.com/alibaba/druid 2013-07-05 08:42:20 +08:00
wenshao 4b8e847cb1 support initSqls 2013-07-04 23:38:16 +08:00
高阳 bd6aefd6b3 Merge branch 'master' of https://github.com/alibaba/druid
Conflicts:
	src/main/resources/support/http/resources/js/lang.js
2013-07-04 23:00:26 +08:00
wenshao e2b36b7180 improve error info 2013-07-04 15:41:43 +08:00
温高铁 dcda68116d Merge pull request #382 from shrekwang/master
修改wall.html页的样式问题
2013-07-03 09:03:12 -07:00
wenshao 7109cba2e9 0.2.23-SNAPSHOT 2013-07-03 22:50:15 +08:00
wenshao c5126c983a 0.2.22 0.2.22 2013-07-03 22:47:14 +08:00
wenshao 84ed1699bf Merge branch 'master' of https://github.com/wenshao/druid 2013-07-03 21:59:39 +08:00
wenshao bde289e716 fixed testcase 2013-07-03 21:59:24 +08:00
wenshao dcae4e2247 bug fixed for multi-lang support 2013-07-03 21:58:35 +08:00
高阳 c00b72db4d Merge branch 'master' of https://github.com/alibaba/druid 2013-07-03 21:45:59 +08:00
高阳 d4ccb1e56d 修正了部分title无法显示的问题 2013-07-03 21:42:52 +08:00
yaowei f10fdcf6fc support pinGlobalTxToPhysicalConnection setting. 2013-07-03 16:49:41 +08:00
温高铁 71ae21e8c2 Merge pull request #381 from yunnysunny/master
超链接增加小手形状
2013-07-03 00:32:56 -07:00
shrek.wang 8956bbb83b fixes css style issue in wall.html 2013-07-03 12:59:59 +08:00
高阳 ba1005f706 corrected the judge of jconsole's path 2013-07-03 12:46:01 +08:00
高阳 94f99c488e add A tag's cursor css 2013-07-03 12:42:39 +08:00
wenshao 608fe4a2cd fixed for multi-lang support 2013-07-03 11:59:28 +08:00
温高铁 4d468b5a2e Merge pull request #380 from shrekwang/master
修改排序箭头消失问题
2013-07-02 20:51:13 -07:00
shrek.wang 3447762beb fixes orderby mark disapper problem 2013-07-03 11:26:17 +08:00
wenshao b84aea2fba bug fixed for multi-lang support 2013-07-03 09:31:32 +08:00
wenshao 245b601821 bug fixed for multi-lang support 2013-07-03 09:26:28 +08:00
wenshao b58db951d7 bug fixed for multi-lang support 2013-07-03 09:15:09 +08:00
wenshao c58be1823b change chinese translation 2013-07-03 08:53:31 +08:00
wenshao 0cc4b8fb73 bug fixed for spring.html & websession.html 2013-07-03 00:14:18 +08:00
wenshao 759a839a3b bug fixed for histogram display 2013-07-02 23:49:17 +08:00
温高铁 2c9e6863cb Merge pull request #379 from shrekwang/master
一些中文翻译的更新
2013-07-02 02:39:36 -07:00
shrek.wang 9e7cd2d26c some translate fixes 2013-07-02 17:17:01 +08:00
温高铁 0c91b21db3 Merge pull request #378 from yunnysunny/master
中英文语言切换的改动
2013-07-02 01:29:00 -07:00
高阳 7593a98477 modify the Chinese of TruncateCount 2013-07-02 16:10:34 +08:00