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

315 Commits

Author SHA1 Message Date
Tienan Chen 252045b84e refactor 2013-09-11 11:38:09 +08:00
fanfuxiaoran db485bfa5c edit the result.js and test.js 2013-09-11 11:19:36 +08:00
Tienan Chen 0e879ea271 refactor 2013-09-11 11:06:38 +08:00
Tienan Chen 04e064546c refactor 2013-09-11 10:41:16 +08:00
fanfuxiaoran fc31379edc fix the bug:TypeError: Object function ( selector, context ) { // The 
jQuery object is actually just the init constructor 'enhanced' return
new jQuery.fn.init( selector, context, rootjQuery ); } has no method
'cookie' .use the jquery.cookie.js in TreeView instead in 'js'
 2013-09-11 10:06:54 +08:00
fanfuxiaoran f4018dc73f Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 
Conflicts:
	src/main/webapp/result.jsp
 2013-09-11 10:05:37 +08:00
Tienan Chen ecf85989c6 debug 2013-09-11 09:57:44 +08:00
fanfuxiaoran d28f804fc1 fix the bug:TypeError: Object function ( selector, context ) { // The 
jQuery object is actually just the init constructor 'enhanced' return
new jQuery.fn.init( selector, context, rootjQuery ); } has no method
'cookie' in result.jsp------use the jquery.cookie.js in treeview 
insdead of the jquery.cookie.js in "js" folder
 2013-09-11 09:54:31 +08:00
Tienan Chen cbf2eef419 debug 2013-09-11 09:48:58 +08:00
Tienan Chen 8c8c365808 refactor 2013-09-11 09:35:40 +08:00
Tienan Chen d540dd989d refactor 2013-09-11 09:26:49 +08:00
fanfuxiaoran 49e77942f0 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 2013-09-11 08:42:11 +08:00
fanfuxiaoran edbd265db7 commit 2013-09-10 22:53:15 +08:00
Tienan Chen eb45a7452a delete registerAction.java 2013-09-10 20:49:08 +08:00
fanfuxiaoran 1c52e4dc76 add the result.jsp 2013-09-10 20:30:47 +08:00
Tienan Chen c35674d85e remove some unused js and refactor 2013-09-10 19:39:19 +08:00
Tienan Chen 0e9c6bb217 refactor and add 2013-09-10 19:22:48 +08:00
Tienan Chen a25e6d73d8 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 2013-09-10 18:05:08 +08:00
Tienan Chen 81d504d573 refactor 2013-09-10 18:04:53 +08:00
fanfuxiaoran aa80c1d708 change the treeview 2013-09-10 17:54:15 +08:00
Tienan Chen 3e03aca8fa edit the configuration 2013-09-10 17:48:40 +08:00
Tienan Chen 64b4a96c53 add function of add a agent 2013-09-10 16:45:50 +08:00
Tienan Chen 77ba9df679 add function to show the agent's status 2013-09-10 15:43:57 +08:00
fanfuxiaoran f18abf95bc add the TreeView js,css and image folder 2013-09-10 14:51:44 +08:00
Tienan Chen 5fabba3bd8 refactor 2013-09-10 14:08:26 +08:00
Tienan Chen e754fe0d8d refactor 2013-09-10 11:54:34 +08:00
Tienan Chen 795ee0f04a done load agent list 2013-09-10 11:15:52 +08:00
Tienan Chen d01030a783 refactor 2013-09-10 10:27:53 +08:00
Tienan Chen 048560a58e refactor 2013-09-10 10:27:21 +08:00
Tienan Chen c5c5e24a06 reset to merge 2013-09-10 10:14:59 +08:00
fanfuxiaoran f7f4abf79f commit 2013-09-10 08:45:08 +08:00
fanfuxiaoran cbe93a0bc3 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 2013-09-09 15:51:05 +08:00
fanfuxiaoran 29b5ecc930 remove the htprequester to org.bench4q.communication 2013-09-09 15:11:42 +08:00
Tienan Chen 40654ce54d add about admin 2013-09-09 15:06:21 +08:00
fanfuxiaoran a8e81e1e9d Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 
Conflicts:
	src/main/java/org/bench4q/web/controller/AuthorizeActionController.java
	src/main/webapp/bench4qjs/register.js
 2013-09-09 14:34:30 +08:00
fanfuxiaoran 4dbdf5cd42 master model changed 2013-09-09 14:14:44 +08:00
Tienan Chen 144b3e13df add load agents from pool 2013-09-06 20:32:21 +08:00
Tienan Chen 635ef7606c add jstl support for this project 2013-09-06 18:03:00 +08:00
Tienan Chen 05d26a3810 refactor 2013-09-06 11:37:31 +08:00
fanfuxiaoran f7276b4777 edit the style of script.jsp,scriptview.jsp,scriptedit.jsp 2013-09-06 10:06:59 +08:00
Tienan Chen f33cee6d9f add two html pages 2013-09-06 10:03:25 +08:00
fanfuxiaoran e5c5979e44 Merge branch 'master' of https://github.com/lostcharlie/Bench4Q-Web.git 2013-09-05 17:18:29 +08:00
fanfuxiaoran 87c13274b1 change the edit and view 2013-09-05 17:08:19 +08:00
Tienan Chen 4d2b4b31eb refactor 2013-09-05 15:46:48 +08:00
fanfuxiaoran 05483c8388 test 2013-09-05 13:42:14 +08:00
fanfuxiaoran 1b7fd11fc2 scriptview.jsp 2013-09-05 11:22:14 +08:00
Tienan Chen 0e501447b5 Merge branch 'new' 2013-09-05 10:24:58 +08:00
Tienan Chen 2db0d035bd merge the new branch to master step 1 2013-09-05 10:23:35 +08:00
Tienan Chen 44a6fb4217 deal with branches 2013-09-05 09:32:18 +08:00
fanfuxiaoran e69f5da901 add edit script 2013-09-04 20:47:30 +08:00