Commit Graph

247 Commits

Author SHA1 Message Date
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