Commit Graph

4577 Commits

Author SHA1 Message Date
Jonathan Lipps 2ccf32c343 Merge pull request #3056 from jlipps/master
bring back autoLaunch: false (fix #2629, fix #3045)
2014-07-03 15:15:14 -07:00
Jonathan Lipps 4f1e426c95 bring back autoLaunch: false (fix #2629, fix #3045) 2014-07-03 12:41:52 -07:00
Jonathan Lipps ee028492d1 Merge pull request #3054 from jlipps/master
make sure we only check for safari7 dirs in ios7.x (fix #3053)
2014-07-03 12:40:54 -07:00
sebv 1b69662ff6 added element conversion examples 2014-07-04 02:57:37 +08:00
Jonathan Lipps ce85268242 make sure we only check for safari7 dirs in ios7.x (fix #3053) 2014-07-03 10:39:51 -07:00
Jonathan Lipps ea442859fa Merge pull request #3052 from imurchie/isaac-nodesample
Fix webview name in node Android sample
2014-07-03 09:53:48 -07:00
Isaac Murchie 277cc8ee60 Fix webview name in node Android sample 2014-07-03 09:49:59 -07:00
sebv 10250698b0 added protractor bridge example 2014-07-03 22:26:27 +08:00
sebv d4416339d8 node sample fix 2014-07-03 21:44:01 +08:00
seb vincent 71efceca68 Merge pull request #3051 from sebv/working
added selenium-webdriver bridge sample
2014-07-03 06:29:47 -07:00
sebv 36160df4e1 added selenium-webdriver bridge sample 2014-07-03 21:27:28 +08:00
bootstraponline 7dff34d990 Merge pull request #3046 from imurchie/isaac-docs2
Add labels to embedded sample code
2014-07-02 17:58:11 -04:00
Isaac Murchie e6fca318ee Add labels to embedded sample code 2014-07-02 14:57:54 -07:00
Jonathan Lipps 4a9215a675 Merge pull request #3044 from tonetheman/chromedriverKill
ps in kill chromedriver added -f switch and moved awk to  since pid will...
2014-07-02 13:02:38 -07:00
tonetheman 759690bf3c ps in kill chromedriver added -f switch and moved awk to since pid will be second for linux and mac 2014-07-02 14:42:28 -05:00
Jonathan Lipps 90f1a0ede9 update selendroid-simple test so it passes 2014-07-02 11:34:31 -07:00
Jonathan Lipps 8f8d716c28 make a troubleshooting note about preparing safari directory [ci skip] 2014-07-02 11:22:51 -07:00
Jonathan Lipps 33837cb466 make a note about custom controls [ci skip] 2014-07-02 11:22:51 -07:00
Jonathan Lipps 3557cfb340 add info to troubleshooting [ci skip] 2014-07-02 11:22:51 -07:00
Jonathan Lipps 67886e0c54 Merge pull request #3041 from imurchie/isaac-ime
Fix handling of ime activation
2014-07-02 10:02:00 -07:00
Isaac Murchie 3ad294c621 Fix handling of ime activation 2014-07-02 09:58:27 -07:00
Jonathan Lipps e53f49c706 changelog and bump to 1.2.0 for publish v1.2.0 2014-07-01 12:49:05 -07:00
Jonathan Lipps f475ab6426 Merge pull request #3031 from jlipps/master
fix installApp name conflict and add tests (fix #3030)
2014-07-01 11:56:48 -07:00
Jonathan Lipps 3d4a4861e8 fix installApp name conflict and add tests (fix #3030) 2014-07-01 11:48:24 -07:00
Jonathan Lipps d14108b734 ugprade wd 2014-07-01 10:34:44 -07:00
bootstraponline 052548108b Merge pull request #3013 from knorrium/patch-1
Address the Task "setGitRev" not found error
2014-07-01 12:00:31 -04:00
bootstraponline afecfc2bbe Merge pull request #3025 from sebv/style-guide
added jscs to style guide
2014-07-01 10:15:00 -04:00
sebv b7c8528e7f added jscs to style guide 2014-07-01 22:12:35 +08:00
bootstraponline a92f44581c Merge pull request #3007 from bootstraponline/fix_scroll_into_view
Fix scroll into view
2014-07-01 10:00:05 -04:00
sebv c677b94d24 added doc js scrollTo code 2014-07-01 21:46:33 +08:00
bootstraponline b976973dfb Merge pull request #3014 from sebv/doc-readme
added README files in docs dir pointing to the doc site.
2014-07-01 09:34:22 -04:00
sebv c3f5717c55 added README files in docs dir pointing to the doc site. 2014-07-01 21:30:42 +08:00
bootstraponline f5fe25a4a7 Merge pull request #3019 from appium/doc-fixes
doc fixes
2014-07-01 09:12:17 -04:00
bootstraponline 18e558b814 Merge pull request #3018 from sebv/doc-js
Added/fixed doc js sample code.
2014-07-01 09:11:53 -04:00
sebv 590d39a17d doc fixes 2014-07-01 20:30:01 +08:00
sebv 5df9e3750b added/fixed doc js sample code. 2014-07-01 19:55:04 +08:00
seb vincent 7848126632 Merge pull request #3017 from sebv/sample-code
sample code update
2014-07-01 04:45:30 -07:00
sebv b1f8dbddcb sample code update 2014-07-01 19:42:53 +08:00
bootstraponline 19982c2186 Merge pull request #3012 from imurchie/isaac-docs
Add documentation of unicode support
2014-07-01 01:34:37 -04:00
sebv 452369e9e8 test fix 2014-07-01 13:24:25 +08:00
Felipe Knorr Kuhn 2963065c1f Address the Task "setGitRev" not found error
Documenting the fix for the `Task "setGitRev" not found" error as discussed on this thread https://groups.google.com/d/msg/appium-discuss/sVpuR8uaEXQ/LJUW4HII9OQJ
2014-06-30 22:10:41 -07:00
Isaac Murchie 4c482a2d4f Add documentation of unicode support 2014-06-30 16:53:30 -07:00
bootstraponline cfa756d1cd Merge pull request #3010 from imurchie/isaac-apidemos
Update ApiDemos submodule; update reset to use io.appium.android.api package
2014-06-30 17:39:37 -04:00
Isaac Murchie 2c7e843594 Update ApiDemos submodule; update reset to use io.appium.android.api package 2014-06-30 12:09:26 -07:00
bootstraponline bdde3a3a5e Fix scroll into view
If the desired object already exists on screen, then avoid scrolling to it.
Without this check, the server will error because there may not be a scrollable.

Scrollable existance depends on screen size. For testing, it's better to have
code that works regardless if scrolling is required or not. This matches the
complex_find behavior.
2014-06-30 11:17:07 -04:00
Jonathan Lipps 6b24a45906 Merge pull request #2944 from Jonahss/documentation
Documentation
2014-06-28 05:15:03 -07:00
seb vincent 6c8c39e502 Merge pull request #3001 from sebv/duplicate-field
Duplicate fix which doesn't break XPath
2014-06-28 12:13:46 +08:00
sebv 858a254356 duplicate fix which doesn't break XPath 2014-06-28 12:12:41 +08:00
bootstraponline a8007907c2 Merge pull request #2994 from bootstraponline/update_uiauto
Update uiauto with dupe fix
2014-06-27 22:11:27 -04:00
bootstraponline 0b9220b378 Update uiauto with dupe fix 2014-06-27 21:56:54 -04:00