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
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
fanfuxiaoran ca071bf022 add stop running testplan api 2014-08-21 10:27:20 +08:00
fanfuxiaoran e289e32e96 remove the main class 2014-08-21 10:13:40 +08:00
luqiong 72d8c37b0b add drag control 2014-08-21 10:13:22 +08:00
hmm 473d4ff063 rename jsp 2014-08-20 17:12:31 +08:00
luqiong e0b0f7eeb4 edit clear jstree 2014-08-20 16:59:01 +08:00
hmm 9d874db5be behavior edit success 2014-08-20 14:15:32 +08:00
luqiong e92560e3a8 merge jstreeFactory 2014-08-20 10:45:38 +08:00
hmm ea40313135 add jstreeFactory 2014-08-20 10:38:59 +08:00
hmm 253245445c Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Web/src/main/webapp/script/editor/jstreeFactory.js
 2014-08-20 10:37:01 +08:00
luqiong 821b040ca8 add control of only select one node 2014-08-20 10:36:58 +08:00
luqiong 2296c787a2 add 2014-08-20 10:20:20 +08:00
hmm c7009e3832 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-20 10:20:04 +08:00
hmm b21f528bc4 add web behavior edit 2014-08-20 10:19:56 +08:00
luqiong 846648f424 add auto select one node 2014-08-20 09:43:57 +08:00
hmm 5178689bf4 add tree node auto selected 2014-08-20 09:14:08 +08:00
hmm d6e03a7393 add behavior tree editor 2014-08-19 17:28:11 +08:00
hmm d59306aa3f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 
Conflicts:
	Bench4Q-Web/src/main/webapp/createScript.jsp
	Bench4Q-Web/src/main/webapp/script/editor/behavior.js
	Bench4Q-Web/src/main/webapp/script/editor/uiFactory.js
 2014-08-19 17:26:04 +08:00
hmm ea5ca3e25e add page, batch and tree mode to the behavior design 2014-08-19 17:13:41 +08:00
luqiong 2ed4cc227c add plugins of jstree 2014-08-19 17:12:21 +08:00
luqiong d1df404588 change jstree lib file path 2014-08-19 11:08:33 +08:00
hmm 8f583321c1 add BehaviorViewModel in web 2014-08-19 10:40:40 +08:00
hmm 7eefaae62d edit create page 2014-08-19 10:10:48 +08:00
hmm 1688254000 add nickname to plugin model in web 2014-08-18 16:16:33 +08:00
hmm 43196ffc3e add script edit 2014-08-18 10:39:18 +08:00
hmm af0a78629d script editor 2014-08-18 09:55:43 +08:00
hmm 127d4afe1c 点击div层，能使radio选中 2014-08-18 09:01:41 +08:00
hmm 3545cad3fe uiFactory冲突，重新提交 2014-08-15 16:54:51 +08:00
hmm 0950ae617c Conflicts: 
Bench4Q-Web/src/main/webapp/script/editor/uiFactory.js
 2014-08-15 16:47:22 +08:00
hmm 26dd328c8e 添加按特定属性显示radio的方法 2014-08-15 16:42:37 +08:00
hmm e185105512 修改连接到master的ip 2014-08-15 16:41:16 +08:00
luqiong 70db562648 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-15 16:29:39 +08:00
luqiong 859b9696b9 add jstree and edit useBahavior 2014-08-15 16:21:25 +08:00
luqiong f6d63208ee add jstree and edit useBehavior 2014-08-15 16:19:19 +08:00
hmm 728e597367 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-15 14:11:48 +08:00
coderfengyun c2e661733f add code and edit the usepluginmodel 
add code and edit the usepluginmodel
 2014-08-15 13:57:31 +08:00
hmm 5787c7b8b9 homepage.jsp在web-inf文件夹中会使工程有错误 2014-08-14 11:21:53 +08:00
fanfuxiaoran 58b3b56d1d commit the newest script edit 2014-08-14 10:56:05 +08:00
coderfengyun f0296eb398 remove that outer right join 
remove that outer right join
 2014-07-21 13:47:34 +08:00
fanfuxiaoran 37f0a1b49f refactor the master plugin 2014-07-19 18:51:13 +08:00
coderfengyun 7af31f857b refactor 
refactor
 2014-07-19 18:37:21 +08:00
fanfuxiaoran b2b15ab555 update plugin, which can contains cn 2014-07-19 09:49:22 +08:00
fanfuxiaoran e682f608b5 update edit script 2014-07-18 22:24:25 +08:00
fanfuxiaoran ed8ee5f016 remove the bug when click buton .event occur many times 2014-07-17 10:11:14 +08:00
fanfuxiaoran 88dd9ae130 fix bug 2014-07-16 18:03:37 +08:00
fanfuxiaoran e8700549c4 fix bug in agent 2014-07-16 16:34:17 +08:00
fanfuxiaoran 5c509e320a finish the test result view 2014-07-15 10:07:47 +08:00
fanfuxiaoran 8d7e9b14d8 update result behavior 2014-07-14 22:46:05 +08:00
fanfuxiaoran bba93a7db5 fix the datatable bug 2014-07-11 14:16:45 +08:00
fanfuxiaoran 0a4a96559a update detail data 2014-07-04 18:32:42 +08:00
fanfuxiaoran 80c22f6085 fix the behavior 2014-07-04 18:07:00 +08:00
fanfuxiaoran e8528765ae update agent manage 2014-07-04 14:02:42 +08:00
fanfuxiaoran bbcdc89e27 update seddion filter 2014-07-04 11:16:48 +08:00
fanfuxiaoran 614bd80e39 add monitor result 2014-07-04 10:00:58 +08:00
fanfuxiaoran b70bb4aa3d fix the get monitor data 2014-07-03 17:22:23 +08:00
fanfuxiaoran 861a37b422 remove test wrong 2014-07-03 14:35:56 +08:00
fanfuxiaoran c4038feeef remove bug 2014-07-03 13:56:29 +08:00
fanfuxiaoran 37c76081bb refactor 2014-07-03 11:10:45 +08:00
fanfuxiaoran 054af23c0f update behavior and page 2014-07-02 17:33:02 +08:00
fanfuxiaoran def1229fad refactor testPlan result 2014-07-01 16:38:03 +08:00
fanfuxiaoran 49db611739 update the master and web 2014-06-27 17:32:45 +08:00
fanfuxiaoran 5080115875 update Api 2014-06-26 17:32:46 +08:00
fanfuxiaoran b008839121 upadte result jsp 2014-06-26 17:15:29 +08:00
rzs840707 494f6534a7 fix the upload script 2014-06-23 11:19:10 +08:00
fanfuxiaoran e0b9a1be12 replace the google fonts 2014-06-20 09:41:18 +08:00
fanfuxiaoran e50013404d fix the param label bug 2014-06-10 14:03:24 +08:00
fanfuxiaoran 56c316203a fix the bug in upload script file 2014-06-06 11:38:22 +08:00
zhixm1988 0facf86973 revise the newAPI 2014-05-22 10:40:13 +08:00
fanfuxiaoran dc6db78f85 fix the login bug 2014-05-22 10:17:57 +08:00
zhixm1988 71b66be471 revise the agentController and userController newAPI 2014-05-21 10:36:21 +08:00
fanfuxiaoran 4748bac6be refactor agent messager test 2014-05-20 10:43:24 +08:00
zhixm1988 2732b9b3dc Modify the data format to map which received by web interface 2014-05-19 09:41:58 +08:00
zhixm1988 b4a3c9f18b test the information transmitting methods in 
org.bench4q.web.masterMessager package with wiremock
 2014-05-16 09:24:39 +08:00
fanfuxiaoran 5d7e8e995c add script api and test api 2014-05-15 17:31:02 +08:00
fanfuxiaoran 9783574d0e add scriptController 2014-05-15 15:14:19 +08:00
fanfuxiaoran 67a90d69f3 refactor port test 2014-05-14 13:35:26 +08:00
fanfuxiaoran bf8f1693ee refactor master messenger test 2014-05-14 11:39:06 +08:00
fanfuxiaoran f40befc151 refactor 2014-05-14 11:04:24 +08:00
fanfuxiaoran 4f482a40ec add behavior js 2014-05-13 17:45:00 +08:00
zhixm1988 5b28e3f189 add portMessage test with wiremock 2014-05-13 13:23:00 +08:00
coderfengyun 78c568a884 refactor 
refactor
 2014-05-13 08:48:11 +08:00
fanfuxiaoran 9fa7b989c8 add add device 2014-05-09 17:58:58 +08:00
coderfengyun e451b5b68b refactor agentStatus to enum 
refactor agentStatus to enum
 2014-05-09 16:27:09 +08:00
fanfuxiaoran 11e61c546c finish one device editor display 2014-05-09 10:34:00 +08:00
fanfuxiaoran e64e1a9bca add device jsp 2014-05-08 17:54:55 +08:00
fanfuxiaoran 2b99a987c1 refactor the plugin js 2014-05-07 17:45:10 +08:00
zhixm1988 dd3cfe2453 added script unit test 2014-05-07 16:47:06 +08:00
fanfuxiaoran cf93514f0d refactor plugin model 2014-05-07 16:41:09 +08:00
coderfengyun ad4dcf7b52 test and remove bugs 
test and remove bugs
 2014-05-07 14:43:38 +08:00
fanfuxiaoran 4f56536cc4 refactor plugin 2014-05-06 18:01:57 +08:00
fanfuxiaoran 6110e4eba8 refactor plugin js 2014-05-05 17:34:51 +08:00
fanfuxiaoran 9a7af057c1 add script editor uiCommon.js 2014-05-04 17:27:27 +08:00
fanfuxiaoran 9fc26763bd refactor the script editor js 2014-05-04 17:24:51 +08:00
fanfuxiaoran 18113d3f35 change the bug in upload param files 2014-05-04 09:48:57 +08:00
fanfuxiaoran e3fca3fcfd test plugin messager 2014-04-30 17:48:36 +08:00
fanfuxiaoran cd6696dc67 add test to agentMessager 2014-04-30 10:34:06 +08:00
fanfuxiaoran ec705fed2a refactor 2014-04-29 17:31:19 +08:00
fanfuxiaoran 72c1829682 finish the messenger with master in web 2014-04-29 15:20:11 +08:00
zhengyingying c8a7ac6d62 refactor code of upload files function 2014-04-28 17:20:12 +08:00
zhengyingying dfcb67d80e realize upload files 2014-04-28 17:15:59 +08:00
fanfuxiaoran 4dbbcd2f55 chang the the test of upload file 2014-04-28 16:09:14 +08:00