Commit Graph

1852 Commits

Author SHA1 Message Date
hmm 9e0c698dcd Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-25 13:29:25 +08:00
hmm 5f460ef772 change the updateScript api 2014-08-25 13:28:52 +08:00
hmm 51efd4556c set UsePluginModel nickName 2014-08-25 13:28:29 +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 050c231ae6 change "Get" to "get" 2014-08-25 08:39:35 +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
fanfuxiaoran 3522d52b96 change nameCN to nullable false 2014-08-22 15:52:36 +08:00
luqiong 8c88fd9076 fix editScript 2014-08-22 14:22:31 +08:00
coderfengyun 88cc32a8fc Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-08-22 14:20:32 +08:00
luqiong 4a0db1a002 add init jstree of editEcript 2014-08-22 14:19:25 +08:00
coderfengyun a70cda6d62 add test about ScriptSampler
add test about ScriptSampler
2014-08-22 14:19:10 +08:00
coderfengyun ab845abf2a add test about ScriptSampler
add test about ScriptSampler
2014-08-22 14:18:03 +08:00
hmm f16bf5a637 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-22 14:10:22 +08:00
hmm f47d025b38 change BathcModel Id to id 2014-08-22 14:10:10 +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
fanfuxiaoran 6831f0ab93 fix tow script run on one agent 2014-08-22 09:16:21 +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 2f615ca6ae add name create time to testResult model 2014-08-21 16:58:54 +08:00
fanfuxiaoran f78be23664 add name...to testplanresult model 2014-08-21 16:56:49 +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
coderfengyun e8f6444084 add server status to master,
make it easy for admin to control the test
2014-08-21 14:23:14 +08:00
coderfengyun 87d700e462 add new api to show the current running Testplans
add new api to show the current running Testplans
2014-08-21 14:15:36 +08:00
coderfengyun 3c12ea5ec5 add guard about the owner
add guard about the owner
2014-08-21 14:09:52 +08:00
coderfengyun b6da61daa1 pass the tests about testplan abort
pass the tests about testplan abort
2014-08-21 14:03:49 +08:00
luqiong ea53212a53 edit contextmenu of jstree 2014-08-21 13:53:46 +08:00
coderfengyun d8cb749f6b add test about stop runningAgent twice
add test about stop runningAgent twice
2014-08-21 13:28:35 +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 41f7dd7b42 PageModel add id 2014-08-21 13:20:21 +08:00
hmm 87a16b3ee5 PageModel add id 2014-08-21 13:20:03 +08:00