hmm
|
c55daae043
|
add loadProperties.js
|
2014-09-02 15:37:12 +08:00 |
hmm
|
8c1e9dd11f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-02 15:06:32 +08:00 |
hmm
|
fb2a04fd68
|
add stoprecording and stopproxyserver api
|
2014-09-02 15:06:17 +08:00 |
daisyonly
|
3672d3d101
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-02 14:40:15 +08:00 |
daisyonly
|
9fc76cf05e
|
Add "required" tips
Add "required" tips
|
2014-09-02 14:40:00 +08:00 |
luqiong
|
5564c9d78b
|
modify stopServer button
modify stopServer button
|
2014-09-02 14:22:17 +08:00 |
luqiong
|
bbea098553
|
add i18n config
|
2014-09-02 14:08:38 +08:00 |
coderfengyun
|
fccd5d0a27
|
refactor, let the schedule be the stand-alone one
refactor, let the schedule be the stand-alone one
|
2014-09-02 11:39:10 +08:00 |
hmm
|
dd93e0321f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.java
Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessager.java
|
2014-09-02 11:17:37 +08:00 |
hmm
|
3c46fdda89
|
add function filter type of behavior and timer
|
2014-09-02 10:57:50 +08:00 |
coderfengyun
|
2b3f97a605
|
sync
|
2014-09-02 10:41:46 +08:00 |
hmm
|
f3816e8304
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java
|
2014-09-01 14:49:33 +08:00 |
hmm
|
2dcaf3664f
|
add loadFilterTypeList api
|
2014-09-01 14:46:57 +08:00 |
coderfengyun
|
37622fc0ee
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-01 11:07:48 +08:00 |
coderfengyun
|
b17334bfae
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
Conflicts:
Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioCo
ntext.java
Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEn
gine.java
Bench4Q-Master/src/main/java/org/bench4q/master/api/TestPlanController.j
ava
Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/TestPlanMessage
r.java
Bench4Q-Web/src/test/java/org/bench4q/web/test/masterMessager/TestPlanMe
ssageTest.java
|
2014-09-01 11:07:30 +08:00 |
daisyonly
|
03b99cc27e
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-01 10:50:24 +08:00 |
daisyonly
|
86a7926fef
|
edit editorFactory.js
edit editorFactory.js
|
2014-09-01 10:50:08 +08:00 |
hmm
|
c3af582914
|
change startrecording api
|
2014-09-01 10:43:02 +08:00 |
luqiong
|
c0f3ac1daa
|
edit dialog of recordScript
|
2014-09-01 10:23:27 +08:00 |
coderfengyun
|
fb4e9937ea
|
adding the TestSchedule to agent
adding the TestSchedule to agent
|
2014-09-01 10:13:05 +08:00 |
luqiong
|
c2bcf8672a
|
add dialog of recordScript
|
2014-09-01 09:47:02 +08:00 |
hmm
|
56bee56bab
|
add startProxyServer and startRecording api
|
2014-09-01 08:53:38 +08:00 |
daisyonly
|
f3923f64fd
|
edit dataCollect.js
edit dataCollect.js
|
2014-08-29 11:35:44 +08:00 |
daisyonly
|
28965ed380
|
add input content verification
add input content verification
|
2014-08-29 11:24:03 +08:00 |
hmm
|
eb04ea7b18
|
change csvprovider parameter's show
|
2014-08-28 16:43:05 +08:00 |
coderfengyun
|
aaf7f00759
|
fix gitignore problem
|
2014-08-28 08:49:15 +08:00 |
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 |