vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity
225 Commits
14 Branches
21 Tags
144 MiB
Commit Graph

225 Commits (b4e3efad6513ebce1c14674114e1a334af9d1017)

Author SHA1 Message Date
Ariya Hidayat b4e3efad65 Merge pull request #12462 from peter23/gh-pages 
Update 2000-01-02-build.md (apt-get)
 2014-08-17 23:11:59 -07:00
peter23 c6b4051f77 Update 2000-01-02-build.md 2014-08-17 16:54:24 +04:00
peter23 1f01d82b89 Add to apt-get 
libxft-dev also needed. Tested on Debian 7.6.
 2014-08-17 16:53:56 +04:00
Ariya Hidayat 420b16fb22 Merge pull request #12460 from wtw/patch-1 
Fix path to supported web standards
 2014-08-16 11:15:59 -07:00
Ariya Hidayat 42b124cd00 Merge pull request #12418 from krivulcik/patch-1 
Fix documentation for POST method for webpage open() method
 2014-08-16 11:15:28 -07:00
Ariya Hidayat f8210b64ff Merge pull request #12396 from DianeJane/patch-1 
Update 2000-01-01-read-line.md
 2014-08-16 11:14:53 -07:00
Ariya Hidayat 37deababac Merge pull request #12360 from acjones617/patch-1 
Add example code to injectJs docs
 2014-08-16 11:14:28 -07:00
Ariya Hidayat b5cba82fa4 Merge pull request #12353 from felipeyudi/patch-1 
documentation

Conflicts:
	_posts/api/fs/method/2000-01-01-exists.md
 2014-08-16 11:14:06 -07:00
Ariya Hidayat dc7276cd59 Merge pull request #12340 from bitbender/patch-1 
Add example for accessing URL
 2014-08-16 11:12:07 -07:00
Ariya Hidayat d1075624b1 Merge pull request #12338 from mloberg/patch-2 
Update 2000-01-01-make-directory.md
 2014-08-16 11:11:50 -07:00
Ariya Hidayat cadcc1c973 Merge pull request #12337 from mloberg/patch-1 
Update 2000-01-01-exists.md
 2014-08-16 11:11:41 -07:00
Ariya Hidayat 25556ced62 Merge pull request #12281 from tjgrathwell/patch-1 
Update 2000-01-04-supported-web-standards.md
 2014-08-16 11:11:25 -07:00
Ariya Hidayat d801a55361 Merge pull request #12280 from tenten8401/patch-1 
Update 2000-01-01-viewport-size.md
 2014-08-16 11:11:16 -07:00
Ariya Hidayat 0aa487f4f2 Merge pull request #12247 from hannesvdvreken/patch-1 
ariya.github.com -> ariya.github.io
 2014-08-16 11:10:50 -07:00
Ariya Hidayat 6c79176a2f Merge pull request #12218 from klieber/gh-pages 
Adding phantomjs-maven-plugin to related projects.
 2014-08-16 11:10:23 -07:00
Ariya Hidayat 0894941231 Merge pull request #12217 from ThatDanMorgan/patch-3 
Update 2000-01-01-is-file.md
 2014-08-16 11:10:05 -07:00
Ariya Hidayat c99ee0886a Merge pull request #12215 from ThatDanMorgan/patch-2 
Update 2000-01-01-is-directory.md
 2014-08-16 11:09:49 -07:00
Ariya Hidayat 3efe22907f Merge pull request #12214 from ThatDanMorgan/patch-1 
Update 2000-01-01-list.md
 2014-08-16 11:09:40 -07:00
Ariya Hidayat ad3d9b8e0e Merge pull request #12212 from wosinekm/patch-1 
describe framesName shortly
 2014-08-16 11:09:18 -07:00
wtw 141449d0e4 Fix path to supported web standards 2014-08-16 14:07:28 +02:00
Vitaly Slobodin 24e100eb05 Merge pull request #12301 from vassilevsky/remove-extra-article 
Remove extra article
 2014-08-08 18:28:42 +04:00
Andrej Krivulčík 3dd43b7c77 Fix documentation for POST method for webpage open() method 
Change the example for POST data to use directly POST request body instead of javascript object.
 2014-08-05 11:20:51 +02:00
Diane 2e9ea691ce Update 2000-01-01-read-line.md 
I tried fs.close() but it said undefined function. According to the documentation here: https://github.com/ariya/phantomjs/wiki/API-Reference-FileSystem 'close()' is a stream object function that completes the stream operation; so I changed 'fs' to 'stream'.
 2014-07-22 10:14:44 +08:00
Vitaly Slobodin 37e8209bd9 Merge pull request #12373 from mbildner/patch-1 
Update 2000-01-07-related-projects.md. Fix typo "JavaSscript".
 2014-07-15 10:11:18 +04:00
Moshe Bildner 5a92a6c7e3 Update 2000-01-07-related-projects.md 
Fixes typo "JavaSscript" should be "JavaScript"
 2014-07-14 14:13:46 -04:00
Andrew Jones a4738fc4ba Add code example to injectJs docs 
I have added a code example to the docs for injectJs, where previously there was a "// @TODO: Finish page.injectJs example."

I have seen confusion online on how to use injectJs and the differences between injectJs and includeJs. Hopefully adding this example to the docs page will help clear the confusion.
 2014-07-07 20:40:26 -07:00
Felipe Yudi B. Ono e7baad714b documentation 
fs.exists example
 2014-07-02 11:05:43 -03:00
bitbender 0b1c3fcec4 Add example for accessing URL 2014-06-25 22:57:22 +02:00
Matthew Loberg 79c0c561cf Update 2000-01-01-make-directory.md 
Add example to fs.makeDirectory
 2014-06-25 10:45:23 -05:00
Matthew Loberg 7401eefb3f Update 2000-01-01-exists.md 
Add example for fs.exists. Followed [fs.write](https://github.com/ariya/phantomjs/blob/gh-pages/_posts/api/fs/method/2000-01-01-write.md) file as example.
 2014-06-25 10:35:11 -05:00
Ilya Vassilevsky 5965b18a23 Remove extra article 2014-06-11 12:25:53 +04:00
Travis Grathwell 9923b57fdb Update 2000-01-04-supported-web-standards.md 
Replace seemingly defunct 'QtWebkit' link that went to digia.com with one from trac.webkit.org
 2014-06-03 01:07:50 -07:00
tenten8401 ea52b7012f Update 2000-01-01-viewport-size.md 2014-06-01 13:11:16 -04:00
Hannes Van De Vreken fd08a755de ariya.github.com -> ariya.github.io 2014-05-20 15:26:15 +02:00
Kyle Lieber f06c8da478 Adding phantomjs-maven-plugin 2014-05-09 11:43:08 -05:00
Daniel Morgan 67199dbdee Update 2000-01-01-is-file.md 
Adding documentation to fs.isFile()
 2014-05-09 10:11:02 -05:00
Daniel Morgan 728d30c55b Update 2000-01-01-is-directory.md 
Added documentation to fs.isDirectory function
 2014-05-09 10:09:42 -05:00
Daniel Morgan ef0d39469c Update 2000-01-01-list.md 2014-05-09 10:00:56 -05:00
wosinekm 2667c63a15 describe framesName shortly 2014-05-09 14:42:30 +02:00
Ariya Hidayat f1a473c67d Merge remote-tracking branch 'evanj/patch-2' into gh-pages 2014-04-22 21:43:04 -07:00
Evan Jones dc4e1acd91 webPage.addCookie: Correct required properties 
domain is not needed. If omitted, all cookies are permitted. path required.
 2014-04-17 18:01:38 -04:00
Evan Jones a1e91969ce fs.read: Add documentation and example. 2014-04-17 17:54:02 -04:00
Ariya Hidayat 2d85dff9c4 Merge pull request #12100 from knuton/patch-1 
Minor improvements to screen capture docs
 2014-03-30 07:07:55 -07:00
Ariya Hidayat 6a127b5e25 Download page: supply MD5 and SHA-256 checksums. 
https://github.com/ariya/phantomjs/issues/12058
 2014-03-30 07:05:22 -07:00
Johannes Emerich 6c7a9bf1c4 Improve wording in screen capture docs 2014-03-29 13:21:40 +01:00
Johannes Emerich de19af701b Fix two broken links 
Fixed one link markup, removed one dead link.
 2014-03-29 13:13:54 +01:00
Ivan De Marino 6a1a25d055 Merge branch 'patch-2' of https://github.com/tonyhaddon/phantomjs into tonyhaddon-patch-2 2014-03-29 11:24:13 +00:00
Ivan De Marino b449ec3fd7 Merge branch 'patch-1' of https://github.com/tonyhaddon/phantomjs into tonyhaddon-patch-1 2014-03-29 11:23:13 +00:00
Ivan De Marino 04833d2697 Merge branch 'gh-pages-remove-macports-warning' of https://github.com/frankoid/phantomjs into frankoid-gh-pages-remove-macports-warning 2014-03-29 11:20:56 +00:00
Ivan De Marino 15f5264336 Merge branch 'patch-1' of https://github.com/Micka33/phantomjs into Micka33-patch-1 
Conflicts:
	_posts/api/webpage/method/2000-01-01-render.md
 2014-03-29 11:19:36 +00:00