Commit Graph

  • f7162f7302 Fix coding style (brace placement and indentation with spaces). Ariya Hidayat 2011-09-08 22:35:07 -07:00
  • e674283821 Fix the proxy option example (http is not needed). Ariya Hidayat 2011-09-08 21:37:40 -07:00
  • 64bc80d080 Add simple tests for require(). Ariya Hidayat 2011-09-08 17:54:53 -07:00
  • a62299214d Fix braces placement to follow the coding style. Ariya Hidayat 2011-09-08 17:49:05 -07:00
  • 4fb37aa0cc Create FileSystem instance only when needed. Ariya Hidayat 2011-09-08 17:37:01 -07:00
  • 2b83a52251 Implement require('webpage'). Ariya Hidayat 2011-09-08 17:32:31 -07:00
  • dab9b24983 Regenerate resources IceArmy 2011-09-08 15:53:20 -07:00
  • ad390acd96 Implement require('fs') IceArmy 2011-09-08 15:24:50 -07:00
  • e9d87f0fb2 Merge branch 'master' of git://github.com/ariya/phantomjs IceArmy 2011-09-08 15:14:34 -07:00
  • b412aba06d bootstrap.js: Reindent properly. Ariya Hidayat 2011-09-08 13:25:44 -07:00
  • 6a79ea7e6d Implement require('fs'). Ariya Hidayat 2011-09-08 09:55:50 -07:00
  • 67be09ec80 Update ChangeLog. Ariya Hidayat 2011-09-08 07:34:19 -07:00
  • 080eb26a11 Add the proper *.js files to OTHER_FILES. Ariya Hidayat 2011-09-08 07:15:13 -07:00
  • f51b5144f0 Fix issue 225: netsniff.coffee produces invalid HAR IceArmy 2011-09-08 00:25:51 -07:00
  • 5821a60db1 Rename option/config to localToRemoteUrlAccess(Enabled). IceArmy 2011-09-07 20:52:22 -07:00
  • d94b0c4fbb Fix missing rename from commit 059e7258. Ariya Hidayat 2011-09-07 20:50:02 -07:00
  • e45c5328b9 CoffeeScript version of unrandomize example. Ariya Hidayat 2011-09-07 17:52:58 -07:00
  • 059e72588c Rename option/config to localToRemoteUrlAccess(Enabled). Ariya Hidayat 2011-09-07 09:27:20 -07:00
  • de2dc7b861 Stop unsafe QByteArray conversions using str() IceArmy 2011-09-07 05:00:26 -07:00
  • 8a2b9e77df Include ChangeLog in build_binary IceArmy 2011-09-06 22:45:39 -07:00
  • 70fe7a4777 Don't check for multiple examples paths in build_binary anymore IceArmy 2011-09-06 22:43:19 -07:00
  • bd67351ab0 Fix import of version in build_binary IceArmy 2011-09-06 22:40:33 -07:00
  • 2448157c04 Config to limit the disk cache size IceArmy 2011-09-06 19:32:10 -07:00
  • d35f81bbda Decouple static helper methods from a class. Ariya Hidayat 2011-09-06 16:48:24 -07:00
  • bc348c5a35 Give function parameter a proper name. Ariya Hidayat 2011-09-06 16:44:30 -07:00
  • 962f99fa77 Fix typo in the method name. Ariya Hidayat 2011-09-06 16:39:50 -07:00
  • e14c07f288 Fix member variable initialization order. Ariya Hidayat 2011-09-06 16:38:51 -07:00
  • 07c6eb81f5 Sort include files alphabetically. Ariya Hidayat 2011-09-06 16:37:54 -07:00
  • 3dc9fe53a0 Disk cache object is private for network access. Ariya Hidayat 2011-09-06 16:36:23 -07:00
  • c0e179d59e Do not manage object lifetime, rely on Qt for that. Ariya Hidayat 2011-09-06 16:35:19 -07:00
  • cebe64ec31 Config to limit the disk cache size. Ariya Hidayat 2011-09-06 16:33:11 -07:00
  • 7aa5ec5347 Do not use empty string literal for the default parameter. Ariya Hidayat 2011-09-06 16:01:19 -07:00
  • 5753e739a8 Merge pull request #150 from Roejames12/master Ariya Hidayat 2011-09-05 18:44:04 -07:00
  • d29fb285a8 Merge pull request #152 from durham-university/warnings-fixes Ariya Hidayat 2011-09-05 18:43:42 -07:00
  • 774070809f Fixes a couple of compiler warnings Alex Whitman 2011-09-05 15:23:52 +01:00
  • 8d754a3e95 Remove fs.move; it's already implemented in filesystem-shim IceArmy 2011-09-04 22:43:24 -07:00
  • c3262dcb9b Regenerate resources IceArmy 2011-09-04 22:08:00 -07:00
  • bb1a6fa838 Implement copyTree in filesystem-shim IceArmy 2011-09-04 22:07:17 -07:00
  • afe59b87dc Merge branch 'master' of https://github.com/ariya/phantomjs IceArmy 2011-09-04 22:00:26 -07:00
  • 7cd76309e6 Merge pull request #151 from detro/dev-commonjs_fileio Ariya Hidayat 2011-09-04 21:19:15 -07:00
  • 88991207c2 Added "copyTree(source, destination)" to the set of File API. Ivan De Marino 2011-09-04 23:42:54 +01:00
  • 8c15c80b14 Renamed "fs-shim.js" to "fileystem-shim.js" to ensure name consistency. Ivan De Marino 2011-09-04 21:26:11 +01:00
  • a323161a56 Add HTTP Basic authentication support IceArmy 2011-09-04 03:23:58 -07:00
  • aaabac948c Regenerate resources IceArmy 2011-09-04 02:51:26 -07:00
  • b5899f9064 Added ability to use JSON config files to set command-line arguments IceArmy 2011-09-04 02:46:19 -07:00
  • 5889ef75e9 Merge pull request #149 from Roejames12/master Ariya Hidayat 2011-09-04 00:24:29 -07:00
  • c4a1081e54 Merge pull request #147 from durham-university/http_auth Ariya Hidayat 2011-09-04 00:24:09 -07:00
  • d4fe103a66 Whoops! self.parent != self.m_parent IceArmy 2011-09-04 00:04:12 -07:00
  • f786a4b864 Regenerate resources IceArmy 2011-09-03 23:52:57 -07:00
  • 5f69a34a4f Add execjosh to webpage-shim copyrights IceArmy 2011-09-03 23:51:37 -07:00
  • 189db2f520 Remove unneeded fs.umask IceArmy 2011-09-03 23:44:42 -07:00
  • 1f90c8b9f3 Regenerate resources IceArmy 2011-09-03 22:58:33 -07:00
  • cb216ccc6f Update FS API IceArmy 2011-09-03 22:57:01 -07:00
  • 3410697177 Merge branch 'master' of https://github.com/ariya/phantomjs IceArmy 2011-09-02 22:19:22 -07:00
  • 461d533348 Removing unnecessary Terminal include Paul Dixon 2011-09-02 17:47:33 +02:00
  • af71868c23 add basic http auth support to networkaccessmanager, and add the ability to pass the auth credentials in from the command line mintbridge 2011-09-02 16:35:58 +01:00
  • 2d9f0424e4 Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-09-01 18:06:44 -07:00
  • f83b9a5ba7 Added "touch(path)" to the FS API Ivan De Marino 2011-09-01 00:34:55 +01:00
  • 750e1e98c4 Added "fs.move(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:14:17 +01:00
  • 31c2decbd3 Added "copy(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:01:40 +01:00
  • 12171fc9c6 Improving compliancy of "remove*" Filesystem API. Ivan De Marino 2011-08-31 23:32:56 +01:00
  • 715f1a7fc3 Refactored the JS Shims to be isolated in their own file. Ivan De Marino 2011-08-31 23:19:17 +01:00
  • d243154c2e Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-09-01 17:38:14 -07:00
  • a0b97e8c6f Mac OS X build script: use 4.7.4, static build QtWebKit and PhantomJS. Ariya Hidayat 2011-09-01 17:37:50 -07:00
  • 1f7cb51780 Convert all Qt api's to api 2 IceArmy 2011-09-01 16:04:23 -07:00
  • dcc5b5d595 Stop printing README in setup.py, and rather, if they don't have it, warn user to install PyQt4. IceArmy 2011-09-01 13:13:40 -07:00
  • 106240aa3f Fix bug 8 where setup.py would pull in a file that needed PyQt4, even though it's not required; so it caused setup to fail for people. IceArmy 2011-09-01 13:04:28 -07:00
  • 4a6154b5bd Merge pull request #146 from detro/dev-commonjs_fileio Ariya Hidayat 2011-09-01 00:08:24 -07:00
  • cf4b459d01 Fix bug where we'd get strings that were converted incorrectly: "PyQt4.QtCore.QUrl(u'foo')" IceArmy 2011-08-31 22:38:41 -07:00
  • fb25ec7cd0 Simplify --cookies usage and description IceArmy 2011-08-31 18:15:17 -07:00
  • ff51c695b5 Clean up Encode IceArmy 2011-08-31 17:46:18 -07:00
  • 96641ea8a1 Added "touch(path)" to the FS API Ivan De Marino 2011-09-01 00:34:55 +01:00
  • 619d4b470f Added "fs.move(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:14:17 +01:00
  • f381f61c64 Added "copy(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:01:40 +01:00
  • 87a580f36a Add output-encoding and script-encoding options IceArmy 2011-08-31 15:43:29 -07:00
  • cffd688efd Improving compliancy of "remove*" Filesystem API. Ivan De Marino 2011-08-31 23:32:56 +01:00
  • 3401dd9f78 Refactored the JS Shims to be isolated in their own file. Ivan De Marino 2011-08-31 23:19:17 +01:00
  • 3e8493973c Regenerate resources IceArmy 2011-08-31 11:43:53 -07:00
  • b1ba0ee118 Update bootstrap.js IceArmy 2011-08-31 11:43:15 -07:00
  • 4dca2b3d60 Fixed issue 212: build problem due to config.h. Ariya Hidayat 2011-08-31 09:40:43 -07:00
  • 868e751bea Merge pull request #143 from execjosh/issue-206-web-page-init Ariya Hidayat 2011-08-31 09:28:58 -07:00
  • 8ebd446e58 Merge pull request #145 from detro/master Ariya Hidayat 2011-08-31 09:27:52 -07:00
  • d8d88a3894 Added "Copyright..." line to files on which I worked on. Ivan De Marino 2011-08-31 16:29:40 +01:00
  • 12699b1514 Added the new "--local-access-remote" to the list of additions for the next release. Ivan De Marino 2011-08-31 16:26:25 +01:00
  • 344654854f Merge pull request #140 from execjosh/issue-180-config-file Ariya Hidayat 2011-08-30 22:53:26 -07:00
  • d792cd8d05 Remove ini file related stuff from Config execjosh 2011-08-30 00:50:59 +09:00
  • 3c4699b609 Add "--config" command-line option execjosh 2011-08-30 00:45:39 +09:00
  • 26f7185bf6 Implement JSON config loader execjosh 2011-08-30 00:43:41 +09:00
  • 94c5e270cf Remove superfluous inclusion of QApplication execjosh 2011-08-29 23:24:45 +09:00
  • 8f89ddc9a3 Make Config extend QObject execjosh 2011-08-29 23:23:01 +09:00
  • 783229214c Unit test: remove the test for non-public method. Ariya Hidayat 2011-08-28 15:12:12 -07:00
  • da97b9abbf Fixup copyInto function execjosh 2011-08-28 23:12:52 +09:00
  • 74db4807d5 Actually add parameter to WebPage constructor execjosh 2011-08-28 22:29:31 +09:00
  • 3c790d80a8 Migrate command-line argument processing logic to Config execjosh 2011-08-28 21:40:00 +09:00
  • 43a987d5b4 Merge pull request #142 from execjosh/issue-205-basic-webpage-tests Ariya Hidayat 2011-08-28 05:58:42 -07:00
  • 1ccf1e64be Merge pull request #141 from schmurfy/patch-1 Ariya Hidayat 2011-08-28 05:57:47 -07:00
  • 217b7ecbd4 typo Julien Ammous 2011-08-29 00:12:48 +03:00
  • 9c94a8ef24 Rename ini file code to "Config::loadIniFile" execjosh 2011-08-28 21:12:40 +09:00
  • ad53b9bb3e Rename "PhantomConfig" to "Config" execjosh 2011-08-28 21:05:34 +09:00
  • cad33014b4 Alphabetize WebPage function tests execjosh 2011-08-28 20:24:46 +09:00