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

251 Commits (4106d6b9f3191e0e41dc80b8151de9a2946d6614)

Author SHA1 Message Date
刘强 4106d6b9f3 Update 2000-01-01-working-directory.md 2014-09-22 22:31:12 +08:00
Ariya Hidayat f7f5a26800 Merge pull request #12586 from denali443/patch-1 
Update 2000-01-04-network-monitoring.md
 2014-09-21 23:29:41 -07:00
denali443 d2204b8a00 Update 2000-01-04-network-monitoring.md 2014-09-21 12:34:32 -07:00
Ariya Hidayat eb2498d60f Merge pull request #12584 from josemalonsom/update-link-to-repl-doc-page 
Update 2000-01-01-quick-start.md
 2014-09-21 09:19:16 -07:00
josemalonsom 064f913d0e Update 2000-01-01-quick-start.md 
Update link to REPL doc page.
 2014-09-21 14:07:37 +02:00
Ariya Hidayat d2e7f27790 Merge pull request #12577 from domino14/patch-1 
Update 2000-01-06-users.md
 2014-09-17 20:35:19 -07:00
Cesar Del Solar e5f983b5c7 Update 2000-01-06-users.md 2014-09-17 17:18:24 -07:00
Ariya Hidayat b715b5d742 Merge pull request #12560 from kyro38/patch-1 
Update 2000-01-02-faq.md
 2014-09-11 09:38:56 -07:00
Matthieu Riegler 334b444206 Update 2000-01-02-faq.md 2014-09-11 09:22:48 +02:00
Ariya Hidayat a4f7b63935 Keep the checkout to the generic 1.9 branch (#12534). 2014-09-05 06:38:14 -07:00
Ariya Hidayat 9103b5866e Merge pull request #12534 from Maxpain177/patch-1 
Update 2000-01-02-build.md
 2014-09-05 06:37:15 -07:00
Ariya Hidayat e4adeecb25 Note the build of 1.9 vs 2.0. 2014-09-05 06:36:55 -07:00
Maxpain177 ab79277e8b Update 2000-01-02-build.md 2014-09-03 21:45:57 +07:00
Ariya Hidayat cdc49ebd05 Merge pull request #12513 from nategood/patch-1 
Add code for the plainText example
 2014-08-27 22:17:02 -07:00
Nate Good b7115ddea0 Add code to the example 2014-08-27 20:58:18 -04:00
Ariya Hidayat c0f6859f26 Merge pull request #12492 from acicali/patch-1 
Border is now Margin
 2014-08-23 09:15:00 -07:00
Ariya Hidayat 74527ef6b5 Merge pull request #12497 from myfoxtail/patch-1 
added spawn usage tip
 2014-08-22 19:40:54 -07:00
Alexandra Mourzina 2e77637cf6 added spawn usage tip 2014-08-22 22:07:57 +04:00
acicali 30eb13555b Border > Margin 
Renames border to margin. Describes setting margin as individual dimensions instead of single dimension.
 2014-08-21 16:13:15 -04:00
Ariya Hidayat cb8ec89a1b adopt the latest Related Projects from wiki. 2014-08-19 08:02:15 -07:00
Ariya Hidayat 3404471cf0 updated troubleshooting from wiki. 2014-08-19 07:59:28 -07:00
Ariya Hidayat 44891a3e24 Adopt the CSS3 calc trick from the wiki. 2014-08-19 07:55:54 -07:00
Ariya Hidayat d4ce056e79 update test runners info. 2014-08-19 07:50:09 -07:00
Ariya Hidayat 6284d87ebb Add two more links from the wiki. 2014-08-19 07:42:28 -07:00
Ariya Hidayat cb6d096d02 Fix screenshot of YSlow and Jenkins. 2014-08-19 07:40:14 -07:00
Ariya Hidayat 51abeb851c Some links for IPC info. 2014-08-19 07:36:13 -07:00
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