Commit Graph

  • 471e12a375 JSLint fix: Combine all variable declarations. Ariya Hidayat 2011-12-19 17:52:53 -08:00
  • d5bc2b8192 Update CoffeeScript compiler to version 1.2. Ariya Hidayat 2011-12-19 17:50:49 -08:00
  • 9eae7f101b Add a simpler example for the WebServer module. Ariya Hidayat 2011-12-19 08:27:00 -08:00
  • 32203d9a97 Remove tabs in the ChangeLog. Ariya Hidayat 2011-12-19 08:22:06 -08:00
  • 2823674ec2 Merge branch 'master' of github.com:ariya/phantomjs Ariya Hidayat 2011-12-19 08:15:21 -08:00
  • 6983f6bdf1 Update Sencha folks. Ariya Hidayat 2011-12-19 01:14:31 -08:00
  • 93c542d5f9 Revert some of commit 8ade9f43 IceArmy 2011-12-15 17:06:56 -08:00
  • 3581fae3c0 Revert most of commit c8f45c2d IceArmy 2011-12-15 17:04:23 -08:00
  • c8f45c2d15 Replace more unused variables with _ IceArmy 2011-12-13 13:09:34 -08:00
  • 6f096e1ed7 Merge pull request #184 from wangyang0123/fix-url-for-onResourceRequested Ariya Hidayat 2011-12-13 08:49:32 -08:00
  • 15ac9ab291 fixed TypeError when call e.url in page.onResourceRequested handler http://code.google.com/p/phantomjs/issues/detail?id=305 Danny Wang 2011-12-13 16:39:09 +08:00
  • a300deabe8 Use object identity tests where needed IceArmy 2011-12-11 22:59:50 -08:00
  • 8ade9f43a4 Fixed some small obscure bugs, clean up the code, and renamed unused variables to _ IceArmy 2011-12-11 21:37:33 -08:00
  • b10dc130ce Call qRegisterMetaType on mongoose types Paul Tsier 2011-12-04 22:34:44 -08:00
  • 3c0957834c used QUrl::fromEncoded() and QUrl::toEncoded() instead of QUrl(string) and QUrl::toString() when converting urls Ariya Hidayat 2011-12-11 14:31:22 -08:00
  • d9d2ce73e9 Add arguments to pyphantomjs.main(). Ariya Hidayat 2011-12-11 13:07:06 -08:00
  • 84a339b10a Merge pull request #180 from Roejames12/master Ariya Hidayat 2011-12-11 12:57:49 -08:00
  • ddd7774f87 Merge pull request #179 from v1o/master Ariya Hidayat 2011-12-11 12:53:32 -08:00
  • b460ad3f57 Merge pull request #182 from jonleighton/fix_qurl_segfault Ariya Hidayat 2011-12-11 12:52:15 -08:00
  • e88b0ec5e9 Move setup script to better location IceArmy 2011-12-11 09:39:54 -08:00
  • 38269c7b35 Workaround Qt 4.8 segfault Jon Leighton 2011-12-06 20:25:52 +00:00
  • 930f6f1bcc Fix bug where port number wasn't 0 if listen failed. IceArmy 2011-12-05 08:59:12 -08:00
  • 7567752d2b Don't send body or content-length header under certain conditions IceArmy 2011-12-04 22:44:39 -08:00
  • 18e9575f9d Update comments for patched function IceArmy 2011-12-04 22:01:54 -08:00
  • 5c176eb32a Fix bug where when using sendError, headers were sent again, causing headers to show in the body IceArmy 2011-12-04 19:18:54 -08:00
  • d9bb34b257 Oops! That should be a str, not int. IceArmy 2011-12-04 17:56:14 -08:00
  • 2cc3f636bc WebServer can send error pages with a simple call IceArmy 2011-12-04 15:25:01 -08:00
  • 02fe5f6018 Add hooks to webserver.py IceArmy 2011-12-04 09:41:54 -08:00
  • 235611ec2f Do a little cleanup IceArmy 2011-12-03 23:04:08 -08:00
  • c12030cd66 Clear self.m_servers at script exit IceArmy 2011-12-03 17:16:10 -08:00
  • f1f2d275c5 Regenerate resources IceArmy 2011-12-02 16:03:52 -08:00
  • b3a589aaa7 This is the basic web server functionality. IceArmy 2011-12-02 16:02:52 -08:00
  • f94b87551d Probably best to take the base of the UnicodeError exceptions... IceArmy 2011-11-30 11:35:44 -08:00
  • 60b8d6b347 Fix bug where unicode characters in script arguments weren't correctly passed along. IceArmy 2011-11-30 11:23:40 -08:00
  • 2ffcd1375f Passed test results failed count as exit code Viorel Dram 2011-11-29 11:39:09 +02:00
  • 424214361a Further refactoring IceArmy 2011-11-27 10:56:12 -08:00
  • 4ec8df3a84 Refactor arguments system IceArmy 2011-11-26 17:13:13 -08:00
  • 4dc051a60e Added ability to specify SOCKS5 proxy type. IceArmy 2011-11-25 11:27:03 -08:00
  • ac95479424 Merge pull request #166 from jgornick/add-socks5-proxy Ariya Hidayat 2011-11-21 20:47:56 -08:00
  • 6c0f723aa9 Merge pull request #175 from jonleighton/fix_mongoose Ariya Hidayat 2011-11-21 10:16:43 -08:00
  • 717c4af108 Explicitly link to libdl Jon Leighton 2011-11-21 18:08:30 +00:00
  • 61f4434247 Merge pull request #174 from KDAB/inspector-for-upstream Ariya Hidayat 2011-11-16 20:43:59 -08:00
  • f77046ea16 Merge pull request #173 from KDAB/git-build Ariya Hidayat 2011-11-16 20:40:32 -08:00
  • d5b2d110fb Add patches Leo Franchi 2011-11-15 22:08:31 -05:00
  • f22877d625 Add Qt 4.8 support to deploy script, along with some patches to qt Leo Franchi 2011-11-15 19:36:14 -05:00
  • fbdbcd7f69 Minor fixes Leo Franchi 2011-11-15 19:11:42 -05:00
  • 610fb41922 Add support for remotely debugging a script. Leo Franchi 2011-10-25 15:16:25 -04:00
  • fa4391d514 Merge pull request #172 from KDAB/webserver-cleaned Ariya Hidayat 2011-11-15 08:11:24 -08:00
  • 46a5ccf1e5 extend webserver test Milian Wolff 2011-11-15 12:28:22 +01:00
  • bd2052631f basic unit testing for WebServer.listen Milian Wolff 2011-11-07 18:35:35 +01:00
  • 5eaf705955 basic unit test for webserver Milian Wolff 2011-11-07 18:25:57 +01:00
  • 667c585424 don't deadlock, could happen on error Milian Wolff 2011-11-07 18:25:38 +01:00
  • 36e8a3e87c cleanup api Milian Wolff 2011-11-07 18:24:45 +01:00
  • e5a35d6416 some API dox Milian Wolff 2011-11-07 17:46:36 +01:00
  • 6376ff0cb9 --debug Milian Wolff 2011-11-07 17:39:23 +01:00
  • a6bde751a9 extend WebServerResponse API Milian Wolff 2011-11-07 17:33:35 +01:00
  • 705eda8823 add read-properties to WebServerRequest Milian Wolff 2011-11-07 16:30:28 +01:00
  • 245eec551f make it possible to access the request headers Milian Wolff 2011-11-07 16:24:20 +01:00
  • f30bfa9fb7 extend WebServerRequest API Milian Wolff 2011-11-07 16:16:54 +01:00
  • 0abdc7f9ed very basic response + request handling for WebServer Milian Wolff 2011-11-05 16:38:08 +01:00
  • 73705e484b first work towards a WebServer Milian Wolff 2011-11-15 13:44:47 +01:00
  • c3179c3dee move mongoose dir, use same setup like in gif folder Milian Wolff 2011-11-05 15:58:03 +01:00
  • feed6fdc72 From now on including mongoose directly in the project Aditya Ivaturi 2011-08-20 10:17:44 -07:00
  • 2e43d7da15 Modified name of the shared lib generated Aditya Ivaturi 2011-08-19 23:19:15 -07:00
  • 2b21135119 Fixed the make command for mingw unknown 2011-08-19 09:35:19 -07:00
  • 71ffff002f Adding mongoose code & commented out parts in Makefile to skip the exe generation Aditya Ivaturi 2011-08-18 23:07:52 -07:00
  • cd9f40b22d Merge branch 'master' of git://github.com/ariya/phantomjs into add-socks5-proxy Joe Gornick 2011-11-08 23:22:30 -06:00
  • d91c5af9b2 Added ability to specify SOCKS5 proxy type. Joe Gornick 2011-09-25 23:51:44 -05:00
  • d8494a3f37 Merge pull request #170 from Roejames12/bfd54c381716fb841bd59372d52c390678c62b2e Ariya Hidayat 2011-11-06 05:40:09 -08:00
  • bfd54c3817 Add a bug fix to the changelog IceArmy 2011-11-05 21:10:46 -07:00
  • 04e281e365 Static Linux build script: disable some more configs. Ariya Hidayat 2011-11-04 16:36:31 -07:00
  • ada7611cda Initial version of build script for static Linux. Ariya Hidayat 2011-11-04 08:35:35 -07:00
  • f1b03e84d9 Bump the unstable version to 1.4. Ariya Hidayat 2011-10-29 10:40:40 -05:00
  • 708c8e4719 Merge pull request #169 from Roejames12/master Ariya Hidayat 2011-10-29 08:36:36 -07:00
  • be8eece175 Refactor hook creation and hook existence checks in plugincontroller IceArmy 2011-10-28 01:03:44 -07:00
  • 5bcd3897a3 Refactored some redundant code from load_plugins() IceArmy 2011-10-28 00:26:22 -07:00
  • ec55ebdc00 Merge branch 'master' of git://github.com/ariya/phantomjs IceArmy 2011-10-26 11:48:04 -07:00
  • 8ffd7a2403 detectsniff example: Check if the web page sniffs the user agent. Ariya Hidayat 2011-10-25 10:19:37 -05:00
  • f18fd5372f Fix regression of onInitialized. Ariya Hidayat 2011-10-25 09:48:27 -05:00
  • 3980f76533 Merge branch 'master' of git://github.com/ariya/phantomjs IceArmy 2011-10-20 20:51:23 -07:00
  • ee9646c5e7 Revert "cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways." IceArmy 2011-10-18 18:52:47 -07:00
  • b032d59297 Merge pull request #168 from Roejames12/master Ariya Hidayat 2011-10-18 00:23:56 -07:00
  • 5ffeef450c cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways. IceArmy 2011-10-17 23:32:55 -07:00
  • 3ea50c443f Minimize down the with statements that use QPyFile IceArmy 2011-10-17 22:44:19 -07:00
  • 005e54de56 Merge branch 'master' of git://github.com/ariya/phantomjs IceArmy 2011-10-17 21:01:45 -07:00
  • 34b595d01d Remove unused javascript files IceArmy 2011-10-17 21:01:17 -07:00
  • d4abd3b71b Merge pull request #167 from detro/master Ariya Hidayat 2011-10-17 20:49:24 -07:00
  • 19b32cff0a Refactored and Centralised how we handle the loading of resource files. Ivan De Marino 2011-10-16 20:35:21 +01:00
  • 761f456c32 Change comment in run-jasmine example to be consistent with the way the code is written 1.3 Nick Rowe 2011-10-06 13:43:12 -07:00
  • 3c11109e28 Merge pull request #164 from nixterrimus/patch-1 Ariya Hidayat 2011-10-06 19:40:30 -07:00
  • 56f470e3a1 Change comment in run-jasmine example to be consistent with the way the code is written Nick Rowe 2011-10-06 13:43:12 -07:00
  • 13118b35bf Avoid deleting a QWebPage inside its own signal emission. IceArmy 2011-10-06 08:28:23 -07:00
  • fe20c0987d Avoid deleting a QWebPage inside its own signal emission. Ariya Hidayat 2011-10-05 17:26:46 -07:00
  • b6e69b5015 Fix bug in CookieJar where QSettings expected str, but got QByteArray instead (#10) IceArmy 2011-10-04 11:16:44 -07:00
  • 3ba6649706 Merge pull request #163 from aportale/master Ariya Hidayat 2011-10-04 21:41:55 -07:00
  • a00d453fcd Minor rewording. Ariya Hidayat 2011-10-04 21:41:35 -07:00
  • bf9a68ed43 Autotest for Issue 249 (text codec support in static builds) Alessandro Portale 2011-10-05 04:34:35 +02:00
  • b8e69788d1 Merge pull request #162 from Roejames12/master Ariya Hidayat 2011-10-04 11:53:13 -07:00
  • af88a37ed8 Fix bug in CookieJar where QSettings expected str, but got QByteArray instead (#10) IceArmy 2011-10-04 11:16:44 -07:00
  • 1505c9a486 Add an actual version in the INSTALL for python-argparse IceArmy 2011-09-28 12:29:56 -07:00