Commit Graph

  • 7aa5ec5347 Do not use empty string literal for the default parameter. Ariya Hidayat 2011-09-06 16:01:19 -0700
  • 5753e739a8 Merge pull request #150 from Roejames12/master Ariya Hidayat 2011-09-05 18:44:04 -0700
  • d29fb285a8 Merge pull request #152 from durham-university/warnings-fixes Ariya Hidayat 2011-09-05 18:43:42 -0700
  • 774070809f Fixes a couple of compiler warnings Alex Whitman 2011-09-05 15:23:52 +0100
  • 8d754a3e95 Remove fs.move; it's already implemented in filesystem-shim IceArmy 2011-09-04 22:43:24 -0700
  • c3262dcb9b Regenerate resources IceArmy 2011-09-04 22:08:00 -0700
  • bb1a6fa838 Implement copyTree in filesystem-shim IceArmy 2011-09-04 22:07:17 -0700
  • afe59b87dc Merge branch 'master' of https://github.com/ariya/phantomjs IceArmy 2011-09-04 22:00:26 -0700
  • 7cd76309e6 Merge pull request #151 from detro/dev-commonjs_fileio Ariya Hidayat 2011-09-04 21:19:15 -0700
  • 88991207c2 Added "copyTree(source, destination)" to the set of File API. Ivan De Marino 2011-09-04 23:42:54 +0100
  • 8c15c80b14 Renamed "fs-shim.js" to "fileystem-shim.js" to ensure name consistency. Ivan De Marino 2011-09-04 21:26:11 +0100
  • a323161a56 Add HTTP Basic authentication support IceArmy 2011-09-04 03:23:58 -0700
  • aaabac948c Regenerate resources IceArmy 2011-09-04 02:51:26 -0700
  • b5899f9064 Added ability to use JSON config files to set command-line arguments IceArmy 2011-09-04 02:46:19 -0700
  • 5889ef75e9 Merge pull request #149 from Roejames12/master Ariya Hidayat 2011-09-04 00:24:29 -0700
  • c4a1081e54 Merge pull request #147 from durham-university/http_auth Ariya Hidayat 2011-09-04 00:24:09 -0700
  • d4fe103a66 Whoops! self.parent != self.m_parent IceArmy 2011-09-04 00:04:12 -0700
  • f786a4b864 Regenerate resources IceArmy 2011-09-03 23:52:57 -0700
  • 5f69a34a4f Add execjosh to webpage-shim copyrights IceArmy 2011-09-03 23:51:37 -0700
  • 189db2f520 Remove unneeded fs.umask IceArmy 2011-09-03 23:44:42 -0700
  • 1f90c8b9f3 Regenerate resources IceArmy 2011-09-03 22:58:33 -0700
  • cb216ccc6f Update FS API IceArmy 2011-09-03 22:57:01 -0700
  • 3410697177 Merge branch 'master' of https://github.com/ariya/phantomjs IceArmy 2011-09-02 22:19:22 -0700
  • 461d533348 Removing unnecessary Terminal include Paul Dixon 2011-09-02 17:47:33 +0200
  • 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 +0100
  • 2d9f0424e4 Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-09-01 18:06:44 -0700
  • f83b9a5ba7 Added "touch(path)" to the FS API Ivan De Marino 2011-09-01 00:34:55 +0100
  • 750e1e98c4 Added "fs.move(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:14:17 +0100
  • 31c2decbd3 Added "copy(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:01:40 +0100
  • 12171fc9c6 Improving compliancy of "remove*" Filesystem API. Ivan De Marino 2011-08-31 23:32:56 +0100
  • 715f1a7fc3 Refactored the JS Shims to be isolated in their own file. Ivan De Marino 2011-08-31 23:19:17 +0100
  • d243154c2e Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-09-01 17:38:14 -0700
  • a0b97e8c6f Mac OS X build script: use 4.7.4, static build QtWebKit and PhantomJS. Ariya Hidayat 2011-09-01 17:37:50 -0700
  • 1f7cb51780 Convert all Qt api's to api 2 IceArmy 2011-09-01 16:04:23 -0700
  • 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 -0700
  • 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 -0700
  • 4a6154b5bd Merge pull request #146 from detro/dev-commonjs_fileio Ariya Hidayat 2011-09-01 00:08:24 -0700
  • cf4b459d01 Fix bug where we'd get strings that were converted incorrectly: "PyQt4.QtCore.QUrl(u'foo')" IceArmy 2011-08-31 22:38:41 -0700
  • fb25ec7cd0 Simplify --cookies usage and description IceArmy 2011-08-31 18:15:17 -0700
  • ff51c695b5 Clean up Encode IceArmy 2011-08-31 17:46:18 -0700
  • 96641ea8a1 Added "touch(path)" to the FS API Ivan De Marino 2011-09-01 00:34:55 +0100
  • 619d4b470f Added "fs.move(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:14:17 +0100
  • f381f61c64 Added "copy(source, dest)" to the set of FS API. Ivan De Marino 2011-09-01 00:01:40 +0100
  • 87a580f36a Add output-encoding and script-encoding options IceArmy 2011-08-31 15:43:29 -0700
  • cffd688efd Improving compliancy of "remove*" Filesystem API. Ivan De Marino 2011-08-31 23:32:56 +0100
  • 3401dd9f78 Refactored the JS Shims to be isolated in their own file. Ivan De Marino 2011-08-31 23:19:17 +0100
  • 3e8493973c Regenerate resources IceArmy 2011-08-31 11:43:53 -0700
  • b1ba0ee118 Update bootstrap.js IceArmy 2011-08-31 11:43:15 -0700
  • 4dca2b3d60 Fixed issue 212: build problem due to config.h. Ariya Hidayat 2011-08-31 09:40:43 -0700
  • 868e751bea Merge pull request #143 from execjosh/issue-206-web-page-init Ariya Hidayat 2011-08-31 09:28:58 -0700
  • 8ebd446e58 Merge pull request #145 from detro/master Ariya Hidayat 2011-08-31 09:27:52 -0700
  • d8d88a3894 Added "Copyright..." line to files on which I worked on. Ivan De Marino 2011-08-31 16:29:40 +0100
  • 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 +0100
  • 344654854f Merge pull request #140 from execjosh/issue-180-config-file Ariya Hidayat 2011-08-30 22:53:26 -0700
  • d792cd8d05 Remove ini file related stuff from Config execjosh 2011-08-30 00:50:59 +0900
  • 3c4699b609 Add "--config" command-line option execjosh 2011-08-30 00:45:39 +0900
  • 26f7185bf6 Implement JSON config loader execjosh 2011-08-30 00:43:41 +0900
  • 94c5e270cf Remove superfluous inclusion of QApplication execjosh 2011-08-29 23:24:45 +0900
  • 8f89ddc9a3 Make Config extend QObject execjosh 2011-08-29 23:23:01 +0900
  • 783229214c Unit test: remove the test for non-public method. Ariya Hidayat 2011-08-28 15:12:12 -0700
  • da97b9abbf Fixup copyInto function execjosh 2011-08-28 23:12:52 +0900
  • 74db4807d5 Actually add parameter to WebPage constructor execjosh 2011-08-28 22:29:31 +0900
  • 3c790d80a8 Migrate command-line argument processing logic to Config execjosh 2011-08-28 21:40:00 +0900
  • 43a987d5b4 Merge pull request #142 from execjosh/issue-205-basic-webpage-tests Ariya Hidayat 2011-08-28 05:58:42 -0700
  • 1ccf1e64be Merge pull request #141 from schmurfy/patch-1 Ariya Hidayat 2011-08-28 05:57:47 -0700
  • 217b7ecbd4 typo Julien Ammous 2011-08-29 00:12:48 +0300
  • 9c94a8ef24 Rename ini file code to "Config::loadIniFile" execjosh 2011-08-28 21:12:40 +0900
  • ad53b9bb3e Rename "PhantomConfig" to "Config" execjosh 2011-08-28 21:05:34 +0900
  • cad33014b4 Alphabetize WebPage function tests execjosh 2011-08-28 20:24:46 +0900
  • ec92ac735c Add basic tests for WebPage execjosh 2011-08-28 20:13:38 +0900
  • 102b421617 Allow for passing options to WebPage constructor execjosh 2011-08-28 19:11:24 +0900
  • 1461ac012d Implement config file (.phantomjsrc) execjosh 2011-08-27 03:03:06 +0900
  • f5f436160c Migrate page settings to PhantomConfig execjosh 2011-08-27 03:02:59 +0900
  • a445b2d7b9 Migrate network access manager settings to PhantomConfig execjosh 2011-08-27 03:02:51 +0900
  • 5441f51607 Migrate proxy settings to PhantomConfig execjosh 2011-08-27 03:02:43 +0900
  • a75f7c9dc3 Create PhantomConfig and migrate output and script encoding settings execjosh 2011-08-27 03:02:35 +0900
  • c4b1d443ff Merge pull request #139 from Roejames12/master Ariya Hidayat 2011-08-24 17:36:30 -0700
  • 84f53357f4 Differentiate between _private and builtin_ IceArmy 2011-08-24 17:01:45 -0700
  • e4dfb406f0 Alter 'should have the default outputEncoding of UTF-8' test to compare against lowercase, for PyPhantomJS compatibility IceArmy 2011-08-24 16:48:42 -0700
  • 1b73d5c310 Add phantom.outputEncoding IceArmy 2011-08-24 16:39:04 -0700
  • 33466c87c3 Fix bug where SafeStreamFilter couldn't decode utf-8 IceArmy 2011-08-24 15:36:56 -0700
  • 5e069ee711 Misc improvements IceArmy 2011-08-24 14:23:51 -0700
  • c517674f3f Merge pull request #137 from execjosh/examples-for-output-encoding Ariya Hidayat 2011-08-24 11:46:59 -0700
  • b5bb07faa4 Add examples for phantom.outputEncoding execjosh 2011-08-25 03:15:26 +0900
  • 66460a7793 Fix building with Qt 4.6. Ariya Hidayat 2011-08-24 05:48:07 -0700
  • 051f3ea839 examples/pizza: Switch to use Yelp. Ariya Hidayat 2011-08-23 23:34:14 -0700
  • 6fe972d0a8 Implement WebPage's release() function in pure C++. Ariya Hidayat 2011-08-23 18:53:53 -0700
  • e6a644e3da Improve the Singleton implementation of CSConverter IceArmy 2011-08-23 16:18:26 -0700
  • 6e4137f16c Merge pull request #136 from Roejames12/master Ariya Hidayat 2011-08-23 12:31:41 -0700
  • 3d8d7342ab Rename self.parent to self.m_parent IceArmy 2011-08-23 12:11:00 -0700
  • 9c464bca13 Regenerate resources IceArmy 2011-08-23 12:10:37 -0700
  • fa285e0aca page.release() now works without JS shim. IceArmy 2011-08-23 12:18:25 -0700
  • 3b263a9ebb Regenerate resources IceArmy 2011-08-23 01:10:56 -0700
  • 2a909173f8 Update bootstrap IceArmy 2011-08-23 01:15:01 -0700
  • 31a75b02a5 Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-08-22 09:03:47 -0700
  • 47929b4507 Mac build script: patch to allow static build, install as final step. Ariya Hidayat 2011-08-22 09:03:11 -0700
  • 08e6c5b8cd Merge pull request #132 from execjosh/issue-194-default-encoding-utf8 Ariya Hidayat 2011-08-22 09:02:29 -0700
  • 4272070d60 Update spec for outputEncoding (should equal "UTF-8") execjosh 2011-08-23 00:54:10 +0900
  • d3cb9fe750 Fix typo. Ariya Hidayat 2011-08-21 22:07:33 -0700
  • c75e595ea4 Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-08-21 15:23:07 -0700