 coderfengyun
|
5390aa5c05
|
ok, i can run it now
ok, i can run it now
|
2014-09-04 14:45:53 +08:00 |
hmm
|
5a0a1074c9
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-04 14:15:24 +08:00 |
|
hmm
|
9756ef1999
|
fix bug "scriptFilterOptionsModel may be null"
|
2014-09-04 14:15:06 +08:00 |
|
coderfengyun
|
55a78b46fe
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
|
2014-09-04 14:09:13 +08:00 |
|
coderfengyun
|
e67a80db8d
|
add new Test
add new Test
|
2014-09-04 14:06:39 +08:00 |
|
hmm
|
ed6f913e7a
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-04 13:44:36 +08:00 |
|
hmm
|
47d4b97131
|
change filter script to testplanscript from script
|
2014-09-04 13:44:22 +08:00 |
|
coderfengyun
|
c9bb8207a4
|
update observers
update observers
|
2014-09-04 10:57:00 +08:00 |
|
hmm
|
e4bd0ded75
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-04 10:44:50 +08:00 |
|
coderfengyun
|
52a048a89a
|
refactor continue
refactor continue
|
2014-09-04 10:43:28 +08:00 |
|
hmm
|
0aef526482
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-04 10:40:23 +08:00 |
|
hmm
|
ecf91213c2
|
solve request header——accept q=*
|
2014-09-04 10:40:09 +08:00 |
|
coderfengyun
|
b943800a02
|
remove redundant code
remove redundant code
|
2014-09-04 09:17:45 +08:00 |
|
coderfengyun
|
6a8e50cf6f
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-04 09:17:14 +08:00 |
|
coderfengyun
|
b00cc44785
|
add support for schedule
add support for schedule
|
2014-09-04 09:17:04 +08:00 |
|
hmm
|
9dfe8caab6
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
Conflicts:
Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js
|
2014-09-04 08:40:55 +08:00 |
|
hmm
|
8f546999fb
|
stopserver after success to stoprecording
|
2014-09-04 08:39:01 +08:00 |
 luqiong
|
39b11dcf18
|
remove recordScript bugs
|
2014-09-03 18:11:49 +08:00 |
|
luqiong
|
06a1d745f2
|
reorganize recordScript code
|
2014-09-03 16:52:26 +08:00 |
|
hmm
|
230a2e23ca
|
list script and testplan by time desc
|
2014-09-03 14:30:05 +08:00 |
|
hmm
|
82f2fe2546
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-03 13:35:24 +08:00 |
|
hmm
|
8b0e7a1985
|
success to filter behavior
|
2014-09-03 13:35:02 +08:00 |
|
coderfengyun
|
e8378b6476
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q
|
2014-09-02 17:37:13 +08:00 |
|
coderfengyun
|
9a5f32df39
|
remove warnings
remove warnings
|
2014-09-02 17:37:02 +08:00 |
|
hmm
|
4e01cf19db
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-02 17:26:19 +08:00 |
|
hmm
|
96941bb33b
|
add filter think-time and sort the js of testplan
|
2014-09-02 17:25:55 +08:00 |
|
coderfengyun
|
3a03b2906a
|
remove warnings
remove warnings
|
2014-09-02 17:24:28 +08:00 |
|
coderfengyun
|
bed2979980
|
remove all bugs
remove all bugs
|
2014-09-02 17:16:26 +08:00 |
|
luqiong
|
26d689e005
|
edit filter dialog
edit filter dialog
|
2014-09-02 16:39:42 +08:00 |
|
coderfengyun
|
2a69bc8884
|
refactor code and remove some bug
refactor code and remove some bug
|
2014-09-02 16:30:13 +08:00 |
|
luqiong
|
01a0e56f6e
|
add filter button
|
2014-09-02 16:09:10 +08:00 |
|
coderfengyun
|
e11965f251
|
add test and remove some bug
add test and remove some bug
|
2014-09-02 15:46:13 +08:00 |
|
hmm
|
89d9b0711f
|
delete unused js
|
2014-09-02 15:44:55 +08:00 |
|
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 |
|
hmm
|
3349e5e0dc
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-02 14:37:01 +08:00 |
|
hmm
|
9a668ddf5e
|
add chunked encoding to response
|
2014-09-02 14:36:43 +08:00 |
|
coderfengyun
|
6e973cf6db
|
add assisting methods for test
refactor, let the schedule be the stand-alone one
|
2014-09-02 14:32:01 +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
|
1bfbbde54d
|
Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git
|
2014-09-02 11:17:58 +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 |
|
luqiong
|
db964183e2
|
modify the gettter to transient
modify the gettter to transient
|
2014-09-02 11:16:15 +08:00 |
|
hmm
|
5a6ce8a63b
|
no creating new entity
|
2014-09-02 10:59:50 +08:00 |
|
hmm
|
723de68ba8
|
get expcode and expcnttype from recording
|
2014-09-02 10:58:47 +08:00 |
|
hmm
|
3c46fdda89
|
add function filter type of behavior and timer
|
2014-09-02 10:57:50 +08:00 |