[ckan-changes] [okfn/ckan] e88a39: [#877] First cut of adding Nginx instructions

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: e88a39940c6aaedca93a2b0dbd334d95d2f1d2e3
      https://github.com/okfn/ckan/commit/e88a39940c6aaedca93a2b0dbd334d95d2f1d2e3
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#877] First cut of adding Nginx instructions


  Commit: c50b56d7951f1ae2c84e429d35ebdd56a11e930c
      https://github.com/okfn/ckan/commit/c50b56d7951f1ae2c84e429d35ebdd56a11e930c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_auth.py
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    M doc/legacy-api.rst
    M doc/test.rst
    A doc/upgrading-dependencies.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 877-nginx-instructions


  Commit: 004e640451116142a530f3b59c394edf8c5c3698
      https://github.com/okfn/ckan/commit/004e640451116142a530f3b59c394edf8c5c3698
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M doc/conf.py
    M doc/deployment.rst

  Log Message:
  -----------
  Update instructions for Nginx config file


  Commit: a5057a19280142cfae2f664fc057bb1b027c5b3c
      https://github.com/okfn/ckan/commit/a5057a19280142cfae2f664fc057bb1b027c5b3c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    M doc/configuration.rst
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 877-nginx-instructions


  Commit: e36ba3e0f339b60f5d8ee1a3438449ed12c256ce
      https://github.com/okfn/ckan/commit/e36ba3e0f339b60f5d8ee1a3438449ed12c256ce
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M doc/conf.py
    M doc/deployment.rst

  Log Message:
  -----------
  Merge branch '877-nginx-instructions'


Compare: https://github.com/okfn/ckan/compare/0e19cb21a404...e36ba3e0f339