Commit Graph

2003 Commits

Author SHA1 Message Date
daisyonly 78e28af099 add pie chart to result.jsp 2014-09-05 15:35:05 +08:00
hmm 7fd8fcc076 add warning when server error 2014-09-05 15:34:39 +08:00
hmm 6759fd36d8 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-05 15:13:16 +08:00
hmm 731edb5ea7 change test plan submit 2014-09-05 15:13:06 +08:00
luqiong c86b657d85 modify testPlan input css 2014-09-05 14:56:35 +08:00
hmm 319e2cc646 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-05 14:12:00 +08:00
hmm ed62f1d8f0 1。script name can't be null
2.get the charset from html
3.close record server when web page closed
2014-09-05 14:11:21 +08:00
daisyonly e918b08277 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-05 10:35:59 +08:00
daisyonly 074f5b3fd4 fix bug "Specify the attribute is required or optional" 2014-09-05 10:35:43 +08:00
luqiong bdba094fff modify testPlan settings charPlots 2014-09-04 18:54:32 +08:00
hmm 86a52df435 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 17:43:42 +08:00
hmm 37abca2229 response host ip to web when recording script
resolve stop recording button 
add highlight in new script and new testplan webpage
2014-09-04 17:43:29 +08:00
daisyonly 8bf1705460 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-04 17:37:50 +08:00
daisyonly ac3d0ee6d2 edit chart.js 2014-09-04 17:37:34 +08:00
coderfengyun ff5dd49e0b remove all problem about ms to s
remove all problem about ms to s
2014-09-04 15:33:19 +08:00
daisyonly ef8a7a9a2e update scripEditor.js 2014-09-04 15:32:36 +08:00
daisyonly 786374fa68 edit containerfactory.js
edit containerfactory.js
2014-09-04 15:27:00 +08:00
daisyonly 4c8a1bb9af creat and edit csvprovider plugin
creat and edit csvprovider plugin
2014-09-04 15:25:25 +08:00
daisyonly 1f031c4cad Revert "edit CsvProvider Plugin"
This reverts commit ed466e085ab3187da7df8e4f9c2ce0e933d77ed3.
2014-09-04 15:06:57 +08:00
daisyonly 9781437652 edit CsvProvider Plugin
edit CsvProvider Plugin
2014-09-04 15:06:54 +08:00
coderfengyun 0f29deb274 remove a bug for ms to s
remove a bug for ms to s
:from milisecond to second
2014-09-04 15:02:53 +08:00
coderfengyun 5390aa5c05 ok, i can run it now
ok, i can run it now
2014-09-04 14:45:53 +08:00
hmm 5a0a1074c9 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 14:15:24 +08:00
hmm 9756ef1999 fix bug "scriptFilterOptionsModel may be null" 2014-09-04 14:15:06 +08:00
coderfengyun 55a78b46fe Merge remote-tracking branch 'origin/master'
Conflicts:

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java

	Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
2014-09-04 14:09:13 +08:00
coderfengyun e67a80db8d add new Test
add new Test
2014-09-04 14:06:39 +08:00
hmm ed6f913e7a Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 13:44:36 +08:00
hmm 47d4b97131 change filter script to testplanscript from script 2014-09-04 13:44:22 +08:00
coderfengyun c9bb8207a4 update observers
update observers
2014-09-04 10:57:00 +08:00
hmm e4bd0ded75 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 10:44:50 +08:00
coderfengyun 52a048a89a refactor continue
refactor continue
2014-09-04 10:43:28 +08:00
hmm 0aef526482 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-04 10:40:23 +08:00
hmm ecf91213c2 solve request header——accept q=* 2014-09-04 10:40:09 +08:00
coderfengyun b943800a02 remove redundant code
remove redundant code
2014-09-04 09:17:45 +08:00
coderfengyun 6a8e50cf6f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-04 09:17:14 +08:00
coderfengyun b00cc44785 add support for schedule
add support for schedule
2014-09-04 09:17:04 +08:00
hmm 9dfe8caab6 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js
2014-09-04 08:40:55 +08:00
hmm 8f546999fb stopserver after success to stoprecording 2014-09-04 08:39:01 +08:00
luqiong 39b11dcf18 remove recordScript bugs 2014-09-03 18:11:49 +08:00
luqiong 06a1d745f2 reorganize recordScript code 2014-09-03 16:52:26 +08:00
hmm 230a2e23ca list script and testplan by time desc 2014-09-03 14:30:05 +08:00
hmm 82f2fe2546 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-03 13:35:24 +08:00
hmm 8b0e7a1985 success to filter behavior 2014-09-03 13:35:02 +08:00
coderfengyun e8378b6476 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-02 17:37:13 +08:00
coderfengyun 9a5f32df39 remove warnings
remove warnings
2014-09-02 17:37:02 +08:00
hmm 4e01cf19db Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 17:26:19 +08:00
hmm 96941bb33b add filter think-time and sort the js of testplan 2014-09-02 17:25:55 +08:00
coderfengyun 3a03b2906a remove warnings
remove warnings
2014-09-02 17:24:28 +08:00
coderfengyun bed2979980 remove all bugs
remove all bugs
2014-09-02 17:16:26 +08:00
luqiong 26d689e005 edit filter dialog
edit filter dialog
2014-09-02 16:39:42 +08:00