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 |
|
daisyonly
|
a5b7b95958
|
edit ui.xml
|
2014-08-25 17:06:12 +08:00 |
|
hmm
|
51efd4556c
|
set UsePluginModel nickName
|
2014-08-25 13:28:29 +08:00 |
|
hmm
|
f47d025b38
|
change BathcModel Id to id
|
2014-08-22 14:10:10 +08:00 |
 fanfuxiaoran
|
f78be23664
|
add name...to testplanresult model
|
2014-08-21 16:56:49 +08:00 |
|
hmm
|
41f7dd7b42
|
PageModel add id
|
2014-08-21 13:20:21 +08:00 |
|
hmm
|
0950ae617c
|
Conflicts:
Bench4Q-Web/src/main/webapp/script/editor/uiFactory.js
|
2014-08-15 16:47:22 +08:00 |
 coderfengyun
|
c2e661733f
|
add code and edit the usepluginmodel
add code and edit the usepluginmodel
|
2014-08-15 13:57:31 +08:00 |
|
fanfuxiaoran
|
37f0a1b49f
|
refactor the master plugin
|
2014-07-19 18:51:13 +08:00 |
|
fanfuxiaoran
|
e26592c7a5
|
update script behavior
|
2014-07-02 17:34:01 +08:00 |
|
fanfuxiaoran
|
def1229fad
|
refactor testPlan result
|
2014-07-01 16:38:03 +08:00 |
|
coderfengyun
|
0bf512dd4c
|
add code
add code
|
2014-06-23 14:52:29 +08:00 |
|
coderfengyun
|
ee7c390bc6
|
add context plugin
add context plugin
|
2014-06-19 16:40:37 +08:00 |
|
fanfuxiaoran
|
c9c9d06146
|
remove the bug in paramInfoModel
|
2014-05-27 11:30:57 +08:00 |
|
fanfuxiaoran
|
f40befc151
|
refactor
|
2014-05-14 11:04:24 +08:00 |
|
coderfengyun
|
e451b5b68b
|
refactor agentStatus to enum
refactor agentStatus to enum
|
2014-05-09 16:27:09 +08:00 |
|
coderfengyun
|
f1d35e0d6f
|
a little step towards mock test
a little step towards mock test
|
2014-05-09 14:22:31 +08:00 |
|
fanfuxiaoran
|
a031286fc6
|
fix the bug in paramInfo
|
2014-05-09 14:15:06 +08:00 |
|
coderfengyun
|
966e07c3c2
|
refactor and add tests
refactor and add tests: on the way of mock test
|
2014-05-09 13:58:20 +08:00 |
|
coderfengyun
|
c33737587c
|
refactor
refactor
|
2014-05-09 09:02:38 +08:00 |
|
fanfuxiaoran
|
389b4f3936
|
fix the select
|
2014-05-08 17:54:35 +08:00 |
|
fanfuxiaoran
|
cf93514f0d
|
refactor plugin model
|
2014-05-07 16:41:09 +08:00 |
|
fanfuxiaoran
|
24ffcd6925
|
refactor the post multipartfile
|
2014-05-04 17:25:22 +08:00 |
|
fanfuxiaoran
|
dcf2e9c559
|
update post multipart file
|
2014-05-04 09:49:47 +08:00 |
|
zhengyingying
|
2cc40c7f24
|
share modification
|
2014-04-29 10:07:13 +08:00 |
|
fanfuxiaoran
|
75666ffde7
|
add a post multipartFile for test
|
2014-04-28 16:09:59 +08:00 |
|
coderfengyun
|
1f708ad1a5
|
add tests for hBasePlugin
add tests for hBasePlugin
|
2014-04-25 14:56:04 +08:00 |
|
coderfengyun
|
4b8408797e
|
fix the ignore not work
|
2014-04-24 10:08:15 +08:00 |
|
coderfengyun
|
184a0042cf
|
refactor, and call the doAfterRun
refactor, and call the doAfterRun
|
2014-04-23 21:20:18 +08:00 |
|
coderfengyun
|
85cc2ef8f8
|
refactor the return of the stop and clean
refactor the return of the stop and clean
|
2014-04-23 08:55:17 +08:00 |
|
fanfuxiaoran
|
f72939ad0f
|
fix the httpRequset postFile
|
2014-04-22 23:18:18 +08:00 |
|
coderfengyun
|
6877d2e59f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Master/pluginUI/ui.xml
Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/plugin/FileType.java
Bench4Q-Master/src/main/resources/org/bench4q/master/config/hibernate.cfg.xml
Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/FileModel.java
|
2014-04-22 17:50:51 +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 |
|
fanfuxiaoran
|
5963e394c8
|
add file type
|
2014-04-22 15:46:12 +08:00 |
|
fanfuxiaoran
|
f03bd61207
|
refactor the plugin xml name
|
2014-04-22 11:11:38 +08:00 |
|
fanfuxiaoran
|
710f3eed56
|
refactor paramInfoModel
|
2014-04-21 14:16:01 +08:00 |
|
fanfuxiaoran
|
e884125f5c
|
refactor the paramInfoModel
|
2014-04-21 09:45:36 +08:00 |
|
fanfuxiaoran
|
dc6a73393e
|
change the paramInfoModel
|
2014-04-21 09:35:23 +08:00 |
|
fanfuxiaoran
|
97c4a31855
|
change the Serialization of paramTypeModel
|
2014-04-18 18:16:31 +08:00 |
|
coderfengyun
|
ae1eb30c2f
|
add update population and refactor
add update population and refactor
|
2014-04-18 13:53:25 +08:00 |
|
fanfuxiaoran
|
5a9d0d2f4b
|
fix some pro
|
2014-04-17 18:14:08 +08:00 |
|
coderfengyun
|
fd20997b24
|
remove those unused tasks
remove those unused tasks
|
2014-04-17 15:40:24 +08:00 |
|
fanfuxiaoran
|
b1b7fa28a1
|
testing plugin controller
|
2014-04-17 14:32:34 +08:00 |
|
fanfuxiaoran
|
3b57cc690f
|
add behavior to behavior
|
2014-04-17 11:38:46 +08:00 |
|
fanfuxiaoran
|
893772aa09
|
change model
|
2014-04-16 17:31:42 +08:00 |
|
coderfengyun
|
136ad41b89
|
recover the edit
recover the edit
|
2014-04-16 15:27:14 +08:00 |
|
fanfuxiaoran
|
038056b284
|
change the model of plugin
|
2014-04-16 15:05:53 +08:00 |
|
coderfengyun
|
8980b2d01c
|
now compile the scenario over
now compile the scenario over
|
2014-04-15 11:03:35 +08:00 |