p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,000 Commits 1 Branch 0 Tags 58 MiB
Commit Graph

345 Commits

Author SHA1 Message Date
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 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
daisyonly 6eba56d7f8 add required in editorFactory 
add required in editorFactory
 2014-08-26 17:37:54 +08:00
daisyonly edb85afd67 add required in editorFactory and containerFactory 
add required in editorFactory and containerFactory
 2014-08-26 17:36:37 +08:00
daisyonly ecdd92c741 remove alert 2014-08-26 09:06:24 +08:00
luqiong a98cb1a06c edit result.css 2014-08-25 18:01:59 +08:00
hmm 3ffc68d3e4 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-25 17:32:55 +08:00
luqiong 98353fc42d edit result.css 2014-08-25 17:34:47 +08:00
hmm 4c53ba8ccd Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/http/ui.xml
	Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/dtd/ui.dtd
 2014-08-25 17:32:22 +08:00
hmm 247de8b4ce add id to page/batch/behavior and set nickName when record script 2014-08-25 17:28:38 +08:00
luqiong 0f947557cc edit result.css 2014-08-25 17:17:00 +08:00
luqiong 76ae9fa22c edit result.css 2014-08-25 17:15:06 +08:00
daisyonly a5b7b95958 edit ui.xml 2014-08-25 17:06:12 +08:00
luqiong f49eb7aa5c edit testHeader css 2014-08-25 14:41:22 +08:00
hmm 9e0c698dcd Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-25 13:29:25 +08:00
hmm 0889c71012 success to submit edit script 2014-08-25 13:28:03 +08:00
luqiong 8b63ac47a4 change alert style 2014-08-25 10:49:39 +08:00
luqiong 13b28346ed change alert style 2014-08-25 10:16:12 +08:00
hmm 9e00326889 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Web/src/main/webapp/editScript.jsp
 2014-08-25 09:00:53 +08:00
hmm a394d3b784 add edit script 2014-08-25 08:39:09 +08:00
daisyonly f31f2d32e0 Organize JS file 2014-08-24 15:11:51 +08:00
hmm 9ca0d5f8f7 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-22 17:13:46 +08:00
hmm c86b8b9129 init script's plugin 2014-08-22 17:13:37 +08:00
luqiong 4d09adf056 edit information 2014-08-22 16:59:35 +08:00
hmm 793e698324 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-22 16:43:08 +08:00
hmm 101484384e add clear plugin editor when clear or remove plugin 2014-08-22 16:42:55 +08:00
luqiong cbb2d58f9d add noty information 2014-08-22 16:29:00 +08:00
luqiong 8c88fd9076 fix editScript 2014-08-22 14:22:31 +08:00
luqiong 4a0db1a002 add init jstree of editEcript 2014-08-22 14:19:25 +08:00
hmm f16bf5a637 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-22 14:10:22 +08:00
hmm 1b0fa87719 success to create new script 2014-08-22 14:09:49 +08:00
fanfuxiaoran fbf4d6fb15 add stop to testplan 2014-08-22 11:09:32 +08:00
hmm 5a928f1108 start to submit script 2014-08-21 17:29:20 +08:00
hmm 4bccb1b987 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-21 17:10:16 +08:00
hmm 681f9a90be add plugin delete and clear 2014-08-21 17:09:56 +08:00
fanfuxiaoran 26231eee15 add test create time and name 2014-08-21 16:56:16 +08:00
hmm 8b3fd4c047 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-21 15:07:43 +08:00
luqiong f96806bbe1 edit contextmenu and create_node 2014-08-21 15:10:36 +08:00
hmm 2a137be83f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Web/src/main/webapp/script/editor/behavior.js
 2014-08-21 15:06:47 +08:00
hmm 1a4d408eb1 reset id index when clear 2014-08-21 15:01:48 +08:00
hmm 8114a3836e eidt plugin nickName 2014-08-21 14:58:10 +08:00
luqiong 700a9145ba add msgbox 2014-08-21 14:42:58 +08:00
luqiong ea53212a53 edit contextmenu of jstree 2014-08-21 13:53:46 +08:00
hmm ee901e8633 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Web/src/main/webapp/script/editor/usePlugin.js
 2014-08-21 13:38:38 +08:00
luqiong 8ff57d21dc edit usePlugin 2014-08-21 13:40:27 +08:00
hmm 920710c634 Modify create plugin 2014-08-21 13:36:51 +08:00
hmm e2a6f42892 PageModel add id 2014-08-21 13:19:35 +08:00
hmm 9f072b48e8 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-21 11:09:00 +08:00
hmm 0ebaf1c936 add function: submit new script 2014-08-21 11:08:50 +08:00