Commit Graph

292 Commits

Author SHA1 Message Date
daisyonly ac3d0ee6d2 edit chart.js 2014-09-04 17:37:34 +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
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 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 8b0e7a1985 success to filter behavior 2014-09-03 13:35:02 +08:00
hmm 96941bb33b add filter think-time and sort the js of testplan 2014-09-02 17:25:55 +08:00
luqiong 26d689e005 edit filter dialog
edit filter dialog
2014-09-02 16:39:42 +08:00
luqiong 01a0e56f6e add filter button 2014-09-02 16:09:10 +08:00
hmm 89d9b0711f delete unused js 2014-09-02 15:44:55 +08:00
hmm c55daae043 add loadProperties.js 2014-09-02 15:37:12 +08:00
hmm 8c1e9dd11f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-09-02 15:06:32 +08:00
hmm fb2a04fd68 add stoprecording and stopproxyserver api 2014-09-02 15:06:17 +08:00
daisyonly 3672d3d101 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-02 14:40:15 +08:00
daisyonly 9fc76cf05e Add "required" tips
Add "required" tips
2014-09-02 14:40:00 +08:00
luqiong 5564c9d78b modify stopServer button
modify stopServer button
2014-09-02 14:22:17 +08:00
luqiong bbea098553 add i18n config 2014-09-02 14:08:38 +08:00
coderfengyun fccd5d0a27 refactor, let the schedule be the stand-alone one
refactor, let the schedule be the stand-alone one
2014-09-02 11:39:10 +08:00
hmm dd93e0321f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.java
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
	Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessager.java
2014-09-02 11:17:37 +08:00
hmm 3c46fdda89 add function filter type of behavior and timer 2014-09-02 10:57:50 +08:00
coderfengyun 2b3f97a605 sync 2014-09-02 10:41:46 +08:00
hmm f3816e8304 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
	Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
2014-09-01 14:49:33 +08:00
hmm 2dcaf3664f add loadFilterTypeList api 2014-09-01 14:46:57 +08:00
coderfengyun 37622fc0ee Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 11:07:48 +08:00
coderfengyun b17334bfae Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java

Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java

Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava

Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java

Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
2014-09-01 11:07:30 +08:00
daisyonly 03b99cc27e Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-09-01 10:50:24 +08:00
daisyonly 86a7926fef edit editorFactory.js
edit editorFactory.js
2014-09-01 10:50:08 +08:00
hmm c3af582914 change startrecording api 2014-09-01 10:43:02 +08:00
luqiong c0f3ac1daa edit dialog of recordScript 2014-09-01 10:23:27 +08:00
coderfengyun fb4e9937ea adding the TestSchedule to agent
adding the TestSchedule to agent
2014-09-01 10:13:05 +08:00
luqiong c2bcf8672a add dialog of recordScript 2014-09-01 09:47:02 +08:00
hmm 56bee56bab add startProxyServer and startRecording api 2014-09-01 08:53:38 +08:00
daisyonly f3923f64fd edit dataCollect.js
edit dataCollect.js
2014-08-29 11:35:44 +08:00
daisyonly 28965ed380 add input content verification
add input content verification
2014-08-29 11:24:03 +08:00
hmm eb04ea7b18 change csvprovider parameter's show 2014-08-28 16:43:05 +08:00
coderfengyun aaf7f00759 fix gitignore problem 2014-08-28 08:49:15 +08:00
hmm 56a302cb4d Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-27 08:38:43 +08:00
hmm 64f433ce2a add responseModel to tranfer new response 2014-08-27 08:38:16 +08:00
hmm 69d6b8b23f add test proxy server api 2014-08-27 08:36:20 +08:00