 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 |
|
zhengyingying
|
a0b8002d55
|
upload file modification
|
2014-04-28 11:08:28 +08:00 |
|
zhengyingying
|
b8d3493d6d
|
add modify pluginParam function in editScript.js
|
2014-04-27 21:34:12 +08:00 |
|
zhengyingying
|
86c69cc4c0
|
modify script in plugin.jsp
|
2014-04-26 15:03:49 +08:00 |
|
zhengyingying
|
a8019b1e79
|
refactor code to scriptEdit,add function to edit plugin
in editScript.js
|
2014-04-26 15:00:09 +08:00 |
|
fanfuxiaoran
|
e47d05f7e3
|
refactor
|
2014-04-25 18:19:37 +08:00 |
|
zhengyingying
|
1eb2c7d352
|
file upload
|
2014-04-25 18:13:41 +08:00 |
|
fanfuxiaoran
|
775b752200
|
change the api of upload script
|
2014-04-24 16:31:01 +08:00 |
|
fanfuxiaoran
|
08e469603a
|
add qunit test example
|
2014-04-24 11:45:53 +08:00 |
|
coderfengyun
|
4b8408797e
|
fix the ignore not work
|
2014-04-24 10:08:15 +08:00 |
|
zhengyingying
|
7b5208eb8e
|
refactor code of script edit
|
2014-04-23 21:48:20 +08:00 |
|
fanfuxiaoran
|
59aba96c7a
|
change the register jsp
|
2014-04-23 13:42:50 +08:00 |
|
fanfuxiaoran
|
1207d4a8c4
|
add admin register
|
2014-04-23 11:37:45 +08:00 |
|
fanfuxiaoran
|
13b91727a1
|
add test resource in web test
|
2014-04-22 23:28:04 +08:00 |
|
fanfuxiaoran
|
bb5ab76823
|
Delete .gitignore
delete the .gitignore:resources in test
|
2014-04-22 23:27:05 +08:00 |
|
fanfuxiaoran
|
6e9a62cbd2
|
add test to upload param file
|
2014-04-22 23:19:23 +08:00 |
|
zhengyingying
|
6a99c27878
|
realize edit script and refactor code
|
2014-04-22 21:31:17 +08:00 |
|
coderfengyun
|
d7082a113c
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
|
2014-04-22 17:47:16 +08:00 |
|
coderfengyun
|
8331391b35
|
edit UploadScriptWithParams
edit UploadScriptWithParams, and need to be tested
|
2014-04-22 17:38:06 +08:00 |
|
ZhengYingYing
|
856a71c38e
|
refactor code in plugin-new.js and modify functions in
pluginActionController.java
|
2014-04-21 20:04:59 +08:00 |
|
fanfuxiaoran
|
e624626951
|
fix close modal
|
2014-04-21 17:50:38 +08:00 |
|
ZhengYingYing
|
6f31b2a49c
|
refactor code in plugin-new.js and modify function in pluginManage.js
|
2014-04-18 18:11:33 +08:00 |
|
ZhengYingYing
|
c2d2ba1488
|
refactor pluginActionController.java , rewrite functions in
plugin-new.js , write function to upload pluginFile
|
2014-04-17 18:28:48 +08:00 |
|
coderfengyun
|
fd20997b24
|
remove those unused tasks
remove those unused tasks
|
2014-04-17 15:40:24 +08:00 |
|
coderfengyun
|
b24375664c
|
redefine the dtd file
redefine the dtd file
|
2014-04-17 10:56:26 +08:00 |
|
zhengyingying
|
9a407a3b04
|
add pluginManage.jsp and refactor pluginActionController.java
|
2014-04-16 19:43:26 +08:00 |
|
zhengyingying
|
b4dec63ba0
|
compress bootStrap.js ,modify the font-family of the index.jsp and fix
the bug in script.jsp
|
2014-04-15 16:19:13 +08:00 |
|
zhengyingying
|
8402fe13d9
|
add two bootstrap js and modify script js
|
2014-04-15 11:20:04 +08:00 |
|
zhengyingying
|
ff1bb8bee4
|
add scriptEditRightMenuBar.jsp and modify some interfaces
|
2014-04-15 11:15:23 +08:00 |
|
zhengyingying
|
39bf833c8d
|
modify editor.css index.css and plugin.css
|
2014-04-15 11:12:25 +08:00 |
|
zhengyingying
|
ca60b7c2e3
|
modify scriptActionController and add ScenarioModel to uploadEditScript
|
2014-04-15 11:10:22 +08:00 |
|
fanfuxiaoran
|
380e5b633f
|
add gson in pom
|
2014-04-08 10:15:50 +08:00 |
|
coderfengyun
|
ae3800160b
|
.gitignore not work well
|
2014-04-08 09:53:17 +08:00 |
|
coderfengyun
|
ec42ccc4a5
|
remove git ignore from all the children projects
remove git ignore from all the children projects
|
2014-04-08 09:27:33 +08:00 |
|
zhengyingying
|
c7aac992cd
|
fix the bug about save editScript
|
2014-04-04 11:31:31 +08:00 |
|
fanfuxiaoran
|
b50e910726
|
replace js
|
2014-04-03 09:45:27 +08:00 |
|
fanfuxiaoran
|
017b8fd588
|
fix the theme bug
|
2014-04-03 09:40:46 +08:00 |
|
zhengyingying
|
baf5f554dc
|
rewrite editScript.js and modify interfaces
|
2014-04-02 21:10:22 +08:00 |
|
fanfuxiaoran
|
2d2ff5593a
|
remove
|
2014-04-02 17:58:14 +08:00 |
|
fanfuxiaoran
|
1ee1563ddb
|
refactor web by remove unused js ,css and image
|
2014-04-02 16:01:56 +08:00 |
|
zhengyingying
|
36158fa6b1
|
refactor script-edit.jsp
|
2014-04-02 15:55:26 +08:00 |
|
zhengyingying
|
cf39711557
|
modify script-edit.jsp
|
2014-04-02 15:33:33 +08:00 |
|
zhengyingying
|
5681f592c6
|
write the createForm function in editScript.js
|
2014-04-02 15:19:29 +08:00 |
|
fanfuxiaoran
|
7203791625
|
refactor js
|
2014-04-02 11:52:12 +08:00 |
|
coderfengyun
|
8d1427dabe
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Web/src/main/webapp/script-edit.jsp
|
2014-04-02 09:50:21 +08:00 |
|
zhengyingying
|
81fa68c989
|
norm the code and write functions in editScript.js
|
2014-04-01 18:23:22 +08:00 |
|
coderfengyun
|
f2b4e77baf
|
refactor the web
refactor the web
|
2014-04-01 17:32:38 +08:00 |
|
fanfuxiaoran
|
d38958ee0a
|
fix the testplan createtime problem
|
2014-04-01 09:52:32 +08:00 |
|
zhengyingying
|
d263a914b9
|
remove buttons in script-edit.jsp
|
2014-04-01 09:34:12 +08:00 |
|
fanfuxiaoran
|
de0d891f38
|
replace register.jsp
|
2014-04-01 09:15:14 +08:00 |
|
fanfuxiaoran
|
d1841dcd8c
|
refactor register jsp
|
2014-03-31 23:24:15 +08:00 |
|
zhengyingying
|
7eaf62e62f
|
add editScript.js and modify some disadvantages
|
2014-03-31 18:05:29 +08:00 |
|
fanfuxiaoran
|
4bf9e81b44
|
fix the bug in agent.jsp
|
2014-03-31 10:54:06 +08:00 |
|
zhengyingying
|
0eaf531fff
|
fix the disadvantages
|
2014-03-29 15:54:39 +08:00 |
|
zhengyingying
|
32acd6ffa5
|
add clearPluginChoosedList removePluginByClicked and
createPluginChoosedLines functions in plugin-new.js
|
2014-03-28 17:14:25 +08:00 |
|
fanfuxiaoran
|
d092cc84e4
|
fix the bug in behaviorAndpage.js
|
2014-03-28 16:14:38 +08:00 |
|
zhengyingying
|
226de40f76
|
add removePluginMethodAfterClicked and clearPluginMethodList functions
|
2014-03-28 16:03:04 +08:00 |
|
zhengyingying
|
e08d08c6d4
|
fix the bug on insertAfter function in pluign-new.js
|
2014-03-28 14:43:42 +08:00 |
|
zhengyingying
|
6b05316265
|
add insertAfter and insertBefore in plugin.jsp
|
2014-03-28 11:46:07 +08:00 |
|
fanfuxiaoran
|
3705b2d81b
|
refactor
|
2014-03-28 11:37:05 +08:00 |
|
coderfengyun
|
aa515f6be3
|
refactor
refactor
|
2014-03-28 11:35:47 +08:00 |
|
fanfuxiaoran
|
212646d9cf
|
remove unused img ,js and css
|
2014-03-28 10:05:41 +08:00 |
|
fanfuxiaoran
|
bd0ea68583
|
add test to monitor result,fix the bug
|
2014-03-27 21:06:11 +08:00 |
|
zhengyingying
|
f197aaf5b4
|
modify the disadvantages
|
2014-03-27 19:34:46 +08:00 |
|
fanfuxiaoran
|
80d8e47a9c
|
add test to get test result
|
2014-03-27 15:49:18 +08:00 |
|
zhengyingying
|
5cbb9f7f2d
|
rewrite submitBehaviors function and fix the interface
|
2014-03-27 11:41:20 +08:00 |
|
zhengyingying
|
e40f7cc031
|
delete unvalued models and functions and modify interface of plugin.jsp
|
2014-03-27 10:29:18 +08:00 |
|
zhengyingying
|
0f1f87ab0e
|
modify the plugin-new.js and plugin.jsp
|
2014-03-26 21:00:46 +08:00 |
|
fanfuxiaoran
|
05dc5952b4
|
add test
|
2014-03-26 17:44:14 +08:00 |
|
zhengyingying
|
fe711cd04f
|
modify interfaces
|
2014-03-26 16:05:13 +08:00 |
|
zhengyingying
|
53af4aeecc
|
write the internationalization of interface
|
2014-03-26 13:36:40 +08:00 |
|
fanfuxiaoran
|
4ca11db283
|
add test to testResult
|
2014-03-26 11:37:28 +08:00 |
|
zhengyingying
|
2d7bb58659
|
fix the bug in plugin-new
|
2014-03-25 22:43:14 +08:00 |
|
zhengyingying
|
d81a453296
|
modify the count in plugin-new.js
|
2014-03-25 17:47:07 +08:00 |
|
fanfuxiaoran
|
fb91341d18
|
add create script
|
2014-03-25 17:35:33 +08:00 |
|
zhengyingying
|
0f065599da
|
add saveBehavior and cancelBehavior functions in plugin-new.js and
modify models in pluignModel.js, as the same time modify plugin.jsp and
plugin.css
|
2014-03-25 17:05:30 +08:00 |
|
zhengyingying
|
d8da4eae34
|
modify interface of plugin.jsp and script.jsp ,and alter plugin-new.js
and plugin.css
|
2014-03-25 13:35:39 +08:00 |
|
zhengyingying
|
021ee6dd97
|
add behaviorFinish() function in plugin-new.js and modify plugin.css
|
2014-03-24 21:49:25 +08:00 |
|
fanfuxiaoran
|
c4bae962ab
|
refactor plugin
|
2014-03-24 17:59:06 +08:00 |
|
fanfuxiaoran
|
7e4e7523e5
|
add admin in login
|
2014-03-24 14:17:06 +08:00 |
|
zhengyingying
|
23fb96dafd
|
add UploadBehaviorRequestModel in pluginModel.js add uploadBehavior
function in pluin-new.js
|
2014-03-24 13:39:52 +08:00 |
|
zhengyingying
|
c8136a4953
|
modify addCol and removeCol functions in plugin-new.js
|
2014-03-22 21:03:07 +08:00 |
|
zhengyingying
|
c4ae8ba57f
|
rewrite createField() createMultiField() createTable() and
createCheckBox() function in plugin-new.js
|
2014-03-21 21:42:53 +08:00 |
|
zhengyingying
|
c58867cc5b
|
modify plugin.css and createTable function in pluign-new.js
|
2014-03-21 18:01:01 +08:00 |
|
zhengyingying
|
4406579532
|
modify the function loadMethodParams in plugin-new.js and
MethodParamModel in pluginModel.js
|
2014-03-21 13:42:01 +08:00 |
|
zhengyingying
|
775d3a5569
|
modify createFeild and createMultiField function in plugin-new.js
|
2014-03-20 19:21:57 +08:00 |
|
zhengyingying
|
f74ba85870
|
modify MethodParamModel in pluginModel.js and createFields function in
plugin-new.js
|
2014-03-20 17:42:05 +08:00 |
|
coderfengyun
|
b7014aeeda
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-03-20 15:58:18 +08:00 |
|
coderfengyun
|
b21400c69c
|
add monitor-sigar
|
2014-03-20 15:55:56 +08:00 |
|
fanfuxiaoran
|
fec13cab15
|
add config file to test
|
2014-03-20 15:20:17 +08:00 |
|
zhengyingying
|
e0e3c9c184
|
modify login.jsp and plugin-new.js
|
2014-03-20 15:19:12 +08:00 |
|
coderfengyun
|
dc658da7c5
|
edit git ignore
|
2014-03-20 14:45:57 +08:00 |
|
coderfengyun
|
1b55034aa7
|
refa descriptor of web
|
2014-03-20 14:20:16 +08:00 |
|
coderfengyun
|
31e8c4c1b9
|
add .gitignore to web
|
2014-03-20 14:05:48 +08:00 |
|
coderfengyun
|
a67fed6d79
|
add pom to web
|
2014-03-20 14:03:21 +08:00 |
|
coderfengyun
|
2ce58fc6cc
|
merge Bench4Q-Web
|
2014-03-20 13:57:18 +08:00 |