[ckan-changes] [ckan/ckan] 595d05: [#1764] Reorder the creation of the SOLR cache of ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 595d0583d82fdc1022a730132d62a978906e90d3
      https://github.com/ckan/ckan/commit/595d0583d82fdc1022a730132d62a978906e90d3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#1764] Reorder the creation of the SOLR cache of the validated package_dict so that it does not include the unvalidated package_dict.


  Commit: 05f2af5dde9d2b2c9867db943860827b8fa12343
      https://github.com/ckan/ckan/commit/05f2af5dde9d2b2c9867db943860827b8fa12343
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#1764] Add tests.


  Commit: fd7d0896a229629a3768ba84a19f51c7aae33c10
      https://github.com/ckan/ckan/commit/fd7d0896a229629a3768ba84a19f51c7aae33c10
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#1764] Change nose imports to stupid long-hand, as per the coding guidelines.


  Commit: a35ae703ddb79077d08cf0d24ccf2c38b5282a85
      https://github.com/ckan/ckan/commit/a35ae703ddb79077d08cf0d24ccf2c38b5282a85
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#1764] Compatibility with python 2.6.


  Commit: fbfdbcccda4106471c2c19597b3c9c0431f738ae
      https://github.com/ckan/ckan/commit/fbfdbcccda4106471c2c19597b3c9c0431f738ae
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  [#1764] PEP8 fix.


  Commit: 852d3752352fefbeb369ea17ec496b8de5d40c6e
      https://github.com/ckan/ckan/commit/852d3752352fefbeb369ea17ec496b8de5d40c6e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    A Dockerfile
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/templates/admin/base.html
    A ckan/templates/admin/trash.html
    M ckan/templates/footer.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/set_permissions.sql
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M doc/contributing/python.rst
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-using-docker.rst
    M doc/theming/best-practices.rst
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1764-solr-rubbish

Conflicts:
	ckan/new_tests/helpers.py


  Commit: cdf8dfd9e7b26f5b6c17b3c9086d92f0d2f608bc
      https://github.com/ckan/ckan/commit/cdf8dfd9e7b26f5b6c17b3c9086d92f0d2f608bc
  Author: Ian Ward <ian at excess.org>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M ckan/controllers/package.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/public/base/less/forms.less
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/snippets/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html

  Log Message:
  -----------
  Merge branch 'master' into 1764-solr-rubbish

Conflicts:
	ckan/new_tests/helpers.py


Compare: https://github.com/ckan/ckan/compare/e43db8bd9897...cdf8dfd9e7b2