p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,483 Commits 1 Branch 0 Tags 58 MiB
Commit Graph

1483 Commits

Author SHA1 Message Date
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
fanfuxiaoran f72939ad0f fix the httpRequset postFile 2014-04-22 23:18:18 +08:00
fanfuxiaoran 3207b48d3a fix the upload script and file 2014-04-22 23:17:01 +08:00
zhengyingying 6a99c27878 realize edit script and refactor code 2014-04-22 21:31:17 +08:00
coderfengyun 9d622781b3 remove conflict 
remove conflict
 2014-04-22 17:53:12 +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
ZhengYingYing afc30d0052 refactor script edit code in plugin-new.js and behaviorsForm.js 2014-04-22 15:16:14 +08:00
fanfuxiaoran f03bd61207 refactor the plugin xml name 2014-04-22 11:11:38 +08:00
fanfuxiaoran d035288cfa fix the bug in get behavior infos ,add test 2014-04-22 11:11:13 +08:00
coderfengyun dc45262df6 refactor 
refactor
 2014-04-22 09:31:29 +08:00
coderfengyun 92b1f36356 refactoring 
refactoring
 2014-04-22 09:16:10 +08:00
coderfengyun 0f9e403731 refactor 
refactor
 2014-04-22 09:13:11 +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
fanfuxiaoran 755599e5aa add paramTypeModel in paramInfoModel 2014-04-21 15:27:23 +08:00
coderfengyun 67b0a9e206 refactor 
refactor
 2014-04-21 15:25:19 +08:00
fanfuxiaoran 710f3eed56 refactor paramInfoModel 2014-04-21 14:16:01 +08:00
ZhengYingYing 6188d14105 remove gson in plugin api 2014-04-21 11:12:34 +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 4aec35152c add test to plugin pramtype 2014-04-21 09:34:41 +08:00
fanfuxiaoran 97c4a31855 change the Serialization of paramTypeModel 2014-04-18 18:16:31 +08:00
ZhengYingYing 6f31b2a49c refactor code in plugin-new.js and modify function in pluginManage.js 2014-04-18 18:11:33 +08:00
coderfengyun ae1eb30c2f add update population and refactor 
add update population and refactor
 2014-04-18 13:53:25 +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
fanfuxiaoran 5a9d0d2f4b fix some pro 2014-04-17 18:14:08 +08:00
fanfuxiaoran 41f9961b41 refactor 2014-04-17 18:13:46 +08:00
coderfengyun fd20997b24 remove those unused tasks 
remove those unused tasks
 2014-04-17 15:40:24 +08:00
coderfengyun 124a499257 refactor 
refactor
 2014-04-17 15:23:32 +08:00
coderfengyun fcee930598 refactor 
refactor
 2014-04-17 15:14:58 +08:00
fanfuxiaoran b1b7fa28a1 testing plugin controller 2014-04-17 14:32:34 +08:00
coderfengyun 136f26e755 refactor the ui.dtd and ui.xml 
refactor the ui.dtd and ui.xml
 2014-04-17 14:11:37 +08:00
coderfengyun ac8a6e0692 refactor 2014-04-17 11:40:17 +08:00
fanfuxiaoran 3b57cc690f add behavior to behavior 2014-04-17 11:38:46 +08:00
coderfengyun 0794013636 remove that bug 
remove that bug
 2014-04-17 11:03:39 +08:00
coderfengyun 59780f7106 edit timer plugin ui 
edit timer plugin ui
 2014-04-17 11:00:37 +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
fanfuxiaoran 893772aa09 change model 2014-04-16 17:31:42 +08:00
fanfuxiaoran 22ef97bd37 add plugin service and controller 2014-04-16 17:09:29 +08:00
coderfengyun 3190963c2d refactor the organization of the code 
refactor the organization of the code
 2014-04-16 17:05:34 +08:00
coderfengyun bb854e437c refactor the organization of the code 
refactor the organization of the code
 2014-04-16 16:49:11 +08:00
coderfengyun 50a4ad2720 refactor 
refactor
 2014-04-16 16:35:23 +08:00
coderfengyun e90a184973 add a param type called "file" 
add a param type called "file"
 2014-04-16 15:46:53 +08:00
coderfengyun 136ad41b89 recover the edit 
recover the edit
 2014-04-16 15:27:14 +08:00