Commit Graph

1852 Commits

Author SHA1 Message Date
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 014037cfef Merge branch 'master' of https://github.com/lostcharlie/Bench4Q 2014-08-21 10:13:37 +08:00
luqiong 72d8c37b0b add drag control 2014-08-21 10:13:22 +08:00
coderfengyun 6db7f9f74d add stop test plan api
http://1drv.ms/1sdOShp
2014-08-21 09:56:54 +08:00
coderfengyun c53abbe0ff add new test
add new test
2014-08-21 09:18:07 +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 f2c6b9db43 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git 2014-08-18 10:40:00 +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 58e3693ea1 脚本编辑部分修改 2014-08-18 09:53:36 +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 c2db1fa1b7 add code
add code
2014-07-21 14:05:07 +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
coderfengyun b8c2367d81 refactor
refactor
2014-07-19 10:34:48 +08:00