Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting defaults through a config file. #279

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Allow setting defaults through a config file. #279

wants to merge 7 commits into from

Commits on Aug 23, 2015

  1. Allow setting defaults through a config file.

    @sunu
    sunu committed Aug 23, 2015
    Configuration menu
    Copy the full SHA
    42b80c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Update dependencies to include pyyaml.

    @sunu
    sunu committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    98d64c8 View commit details
    Browse the repository at this point in the history

  2. A bit of refactoring.

    @sunu
    sunu committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    7415aa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. Use ConfigParser instead of yaml. 

    Also
* Look for config files in some standard locations.
* Add option to specify config file location at startup.
    @sunu
    sunu committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    fa5a9c1 View commit details
    Browse the repository at this point in the history

  2. Remove yaml dependencies.

    @sunu
    sunu committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    080813b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/scrapinghub/splash into c… 

    …onfigfile

Conflicts:
	splash/render_options.py
	splash/server.py
    @sunu
    sunu committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    378f22d View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Use a global variable instead of __builtin__

    @sunu
    sunu committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    8479e7a View commit details
    Browse the repository at this point in the history