[ckan-changes] [okfn/ckan] c08955: Test to find undocumented action functions

• Previous message: [ckan-changes] [okfn/ckan] c08955: Test to find undocumented action functions
• Next message: [ckan-changes] [okfn/ckan] c08955: Test to find undocumented action functions
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/707-implement-group-purging
  Home:   https://github.com/okfn/ckan
  Commit: c08955e9a517abf53592ca59fc83a40d1b1cb976
      https://github.com/okfn/ckan/commit/c08955e9a517abf53592ca59fc83a40d1b1cb976
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Test to find undocumented action functions


  Commit: 427b852e3fc386f93907ecf36900bdbcaae7fce5
      https://github.com/okfn/ckan/commit/427b852e3fc386f93907ecf36900bdbcaae7fce5
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Documentation for member_roles_list


  Commit: 5968443f7f6d8726be850e8cf312977ccd9affdb
      https://github.com/okfn/ckan/commit/5968443f7f6d8726be850e8cf312977ccd9affdb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-24 (Sun, 24 Mar 2013)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix import for asbool


  Commit: 24f686da6cfee95b200e93ec91fafa8949a5de15
      https://github.com/okfn/ckan/commit/24f686da6cfee95b200e93ec91fafa8949a5de15
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckan/logic/auth/create.py

  Log Message:
  -----------
  [#792] Fix auth function


  Commit: 861a45d5bc1fd9b74c7dea1e6574e691b213bf28
      https://github.com/okfn/ckan/commit/861a45d5bc1fd9b74c7dea1e6574e691b213bf28
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    R doc/about.rst
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/database-dumps.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 646-undocumented-action-functions

Conflicts:
	ckan/logic/action/create.py
	ckan/tests/logic/test_action.py


  Commit: 1567fee20dfa4cdf82e2994697f3e8030063ffca
      https://github.com/okfn/ckan/commit/1567fee20dfa4cdf82e2994697f3e8030063ffca
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Document group_member_create


  Commit: 129644f7ad1a9c4066966d6e44fca98131065b14
      https://github.com/okfn/ckan/commit/129644f7ad1a9c4066966d6e44fca98131065b14
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py

  Log Message:
  -----------
  Added documentation for group_member_delete

Updated documentation for group_member_create


  Commit: 550d2a5789b014c87576089d816c3cd4509aa21e
      https://github.com/okfn/ckan/commit/550d2a5789b014c87576089d816c3cd4509aa21e
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#709] Document pckage_relationships_list()


  Commit: 4d95bbc8a0dda2a1d724fca77b9cc6c8b4aa36e0
      https://github.com/okfn/ckan/commit/4d95bbc8a0dda2a1d724fca77b9cc6c8b4aa36e0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#907] Always create the type `nested` with a write connection


  Commit: 05e6e1820d51187937265d8c544ef424dfc1805a
      https://github.com/okfn/ckan/commit/05e6e1820d51187937265d8c544ef424dfc1805a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#907] Remove unused argument context from _get_engine


  Commit: 8fb02d0c038109a70c2e351dcd4a60bb16bcf9eb
      https://github.com/okfn/ckan/commit/8fb02d0c038109a70c2e351dcd4a60bb16bcf9eb
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#907] test_unit does not require blacklisting any more


  Commit: 098109f14a6a38c673a79d58f8342c8b052aaa90
      https://github.com/okfn/ckan/commit/098109f14a6a38c673a79d58f8342c8b052aaa90
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M .tx/config
    M ckan/config/install.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch 'master' into 646-undocumented-action-functions


  Commit: 50552bed67617c1404c7a96a680c465e406daf18
      https://github.com/okfn/ckan/commit/50552bed67617c1404c7a96a680c465e406daf18
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py

  Log Message:
  -----------
  Add docstrings for two more functions

* Add docstring for organization_member-create.
* Add doctstring for organization_member_delete.


  Commit: 951564c9f18c3e1c769f5ce5ee7705489a189008
      https://github.com/okfn/ckan/commit/951564c9f18c3e1c769f5ce5ee7705489a189008
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/search.less
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/search_form.html
    A ckan/templates/snippets/search_form.html

  Log Message:
  -----------
  [#870] First working version of the new search snippets, needs a little tidy up in places


  Commit: af17f41a4362a4f73af78b4032db6d3a283cc89f
      https://github.com/okfn/ckan/commit/af17f41a4362a4f73af78b4032db6d3a283cc89f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Remove tests for docstrings


  Commit: 686bbe978a19c0b6ab57cf6955c7e1514109c478
      https://github.com/okfn/ckan/commit/686bbe978a19c0b6ab57cf6955c7e1514109c478
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Remove fixed functions from the blacklist


  Commit: 79b1de827507f56a3d452d95cd0dd9cbc6837762
      https://github.com/okfn/ckan/commit/79b1de827507f56a3d452d95cd0dd9cbc6837762
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/search.less
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#870] Final tweaks to CSS and templates


  Commit: 0165ebfbc338382adc198bd8c9e37826685be96e
      https://github.com/okfn/ckan/commit/0165ebfbc338382adc198bd8c9e37826685be96e
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read_base.html

  Log Message:
  -----------
  [#844] Adds members tab to groups pages and fixes the members pages


  Commit: aea845aaa03f605268970c776797befe26fde229
      https://github.com/okfn/ckan/commit/aea845aaa03f605268970c776797befe26fde229
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  [#954] Add dataset button on org page fix


  Commit: a829e16484ee111a81637c092cdd5879f0722d5d
      https://github.com/okfn/ckan/commit/a829e16484ee111a81637c092cdd5879f0722d5d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/logic/auth/create.py

  Log Message:
  -----------
  [#954] Allow data_dict=None


  Commit: 6f43c65fa9b318c7aebe3583076fd28cdb5a1a6a
      https://github.com/okfn/ckan/commit/6f43c65fa9b318c7aebe3583076fd28cdb5a1a6a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#954] Coding standards remove file from blacklist


  Commit: 377650446bff790ad05b49755431696e6664336e
      https://github.com/okfn/ckan/commit/377650446bff790ad05b49755431696e6664336e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#970] Add filtering for files and `# CS: ignore`


  Commit: a335c709e5de26eb0bfeaef560016f1f1ae9ffa2
      https://github.com/okfn/ckan/commit/a335c709e5de26eb0bfeaef560016f1f1ae9ffa2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/activity_streams.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/validators.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#970] Fix core files for nasty_string test


  Commit: 65a36f8cefde2c38ef326e10151f85e91667e919
      https://github.com/okfn/ckan/commit/65a36f8cefde2c38ef326e10151f85e91667e919
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#970] Add Spelling test


  Commit: 23447c77b1e7760b140f407149b47f31118aa586
      https://github.com/okfn/ckan/commit/23447c77b1e7760b140f407149b47f31118aa586
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/lib/plugins.py
    M ckan/model/license.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#970] Spelling fix-up for tests to pass


  Commit: 51fd21df16ab873654729a6911966df2c675d05a
      https://github.com/okfn/ckan/commit/51fd21df16ab873654729a6911966df2c675d05a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  resource_update: use package_update like resource_create does


  Commit: 13234320aec6c34b5c3d846cdb9770585966bf9e
      https://github.com/okfn/ckan/commit/13234320aec6c34b5c3d846cdb9770585966bf9e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#851] Don't specify http for dataproxy url to allow usage on https pages


  Commit: 92ca447db50c281379168014536ae2562c610599
      https://github.com/okfn/ckan/commit/92ca447db50c281379168014536ae2562c610599
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  [#890] Adds primary_content_inner to base template and makes use of it


  Commit: ab6694e291b883549e8bf86f1aca0c8d7c6089a0
      https://github.com/okfn/ckan/commit/ab6694e291b883549e8bf86f1aca0c8d7c6089a0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  [#989] Enable streaming in resource proxy


  Commit: dae69faba98fe450e7fbe842ba830363ff4b9c56
      https://github.com/okfn/ckan/commit/dae69faba98fe450e7fbe842ba830363ff4b9c56
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#725] Hide en_GB be default


  Commit: 6e6e8d7b258a26497374afa80cd00ae0f9a48454
      https://github.com/okfn/ckan/commit/6e6e8d7b258a26497374afa80cd00ae0f9a48454
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/package.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/prose.less
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 792-create-dataset-auth-improvement


  Commit: 1c7b086f3801251125831ddd8fff2d396439ccc6
      https://github.com/okfn/ckan/commit/1c7b086f3801251125831ddd8fff2d396439ccc6
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#715] Checks if resource can be previewed and that changes the UX

Adds new helper function to check if a resource can be previewed and adds it to
the templates.


  Commit: 75da354905964f2baa2ec002b1b0fd51f1046780
      https://github.com/okfn/ckan/commit/75da354905964f2baa2ec002b1b0fd51f1046780
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  [#890] Adds num_followers to package_show


  Commit: 5c770097a0bfc2269bd6c86cafdbe14ba082f464
      https://github.com/okfn/ckan/commit/5c770097a0bfc2269bd6c86cafdbe14ba082f464
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Log Message:
  -----------
  @auth_sysadmins_check auth function decorator

Conflicts:
	ckan/new_authz.py

    trivial


  Commit: c5a69716d9f5579cbadced6346bb5ef5edaa31d7
      https://github.com/okfn/ckan/commit/c5a69716d9f5579cbadced6346bb5ef5edaa31d7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/logic/auth/create.py

  Log Message:
  -----------
  [#792] Fix package_create auth function for sysadmins


  Commit: 10e6c7fc90c274c7ea2c2cd12c03803970959e1d
      https://github.com/okfn/ckan/commit/10e6c7fc90c274c7ea2c2cd12c03803970959e1d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#792] Fix some tests now auth changes made


  Commit: 8f751d1eb2c5684071ab10c043e8a3d493b25519
      https://github.com/okfn/ckan/commit/8f751d1eb2c5684071ab10c043e8a3d493b25519
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/templates/header.html

  Log Message:
  -----------
  [#1007] Minor template and user identify changes


  Commit: bba99c006fc1868e940464958857afb5252155d9
      https://github.com/okfn/ckan/commit/bba99c006fc1868e940464958857afb5252155d9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#1007] More template tweaks


  Commit: e3a497366ff4d9bb03d27d18c647f86a6bbc1c26
      https://github.com/okfn/ckan/commit/e3a497366ff4d9bb03d27d18c647f86a6bbc1c26
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1008] Catch ValueError when resource's size is not an int

Fixes #1008.


  Commit: 917b9328144ac73bdb369c7dc82bcbc2e379f300
      https://github.com/okfn/ckan/commit/917b9328144ac73bdb369c7dc82bcbc2e379f300
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1007] Allow minimal user data to be returned from user_show action


  Commit: d6e6fcc52a8d9eff330b902aa41fe25308ceb9bf
      https://github.com/okfn/ckan/commit/d6e6fcc52a8d9eff330b902aa41fe25308ceb9bf
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1007] Ignore_not_sysadmin validator and sysadmin updatable in schema


  Commit: 4ac43d1406c02d017b6568c84eb66dabfab756d8
      https://github.com/okfn/ckan/commit/4ac43d1406c02d017b6568c84eb66dabfab756d8
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#646] Add type. Fix username param

* Add type to all the function parameters.
* Refer to function with `func`.
* Fix _group_or_org_member_delete to use username instead of user_id
  so it's consistent with the other functions.


  Commit: 471ce63fb37f431b3b81af5b847012ca45639041
      https://github.com/okfn/ckan/commit/471ce63fb37f431b3b81af5b847012ca45639041
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M ckan/logic/action/delete.py

  Log Message:
  -----------
  [#646] Make username change backwards compatible


  Commit: 3281080cad1fe2679fbb7192b60f11ab4a1eaf85
      https://github.com/okfn/ckan/commit/3281080cad1fe2679fbb7192b60f11ab4a1eaf85
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/meta.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/test_tag_vocab_plugin.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    A doc/changelog.rst
    M doc/conf.py
    M doc/data-viewer.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 890-button-ia


  Commit: 90ba3a9e9ecdc651ed44f01fb3be897f64d2c009
      https://github.com/okfn/ckan/commit/90ba3a9e9ecdc651ed44f01fb3be897f64d2c009
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/public/base/less/module.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#890] Few tweaks to templates to get ready for iA review


  Commit: dc0172b77769f7249516b656dc42b99852462512
      https://github.com/okfn/ckan/commit/dc0172b77769f7249516b656dc42b99852462512
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#890] Removed debug code


  Commit: 5a15fa55e566b3f731036dd0e05cf0020709f778
      https://github.com/okfn/ckan/commit/5a15fa55e566b3f731036dd0e05cf0020709f778
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  [#890] Fixes for template extends


  Commit: 93c3c06ac1624bc5f00d274a5ef9f8c7a739a553
      https://github.com/okfn/ckan/commit/93c3c06ac1624bc5f00d274a5ef9f8c7a739a553
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/plugins/toolkit.py
    M doc/toolkit.rst

  Log Message:
  -----------
  [#1015] Add new toolkit functions plus minimal docs


  Commit: 2505a6ae341a5bac0abfa61c6118a4dfa5d1eeb7
      https://github.com/okfn/ckan/commit/2505a6ae341a5bac0abfa61c6118a4dfa5d1eeb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#646] Minor edits to some docstrings

Minor edits to some action function docstrings:

- Full stops (see docstring standards)
- a -> an


  Commit: 8814e5dc2f09d01b4244bd054733af324664c915
      https://github.com/okfn/ckan/commit/8814e5dc2f09d01b4244bd054733af324664c915
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#1024] User searches like mark would want


  Commit: 9098fb902e58d095217c85c8a6f0eff63f569033
      https://github.com/okfn/ckan/commit/9098fb902e58d095217c85c8a6f0eff63f569033
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1002] Allow can_preview to return a dict


  Commit: 57eda7092e4a79d6b1a880b6defa664121f4c2ef
      https://github.com/okfn/ckan/commit/57eda7092e4a79d6b1a880b6defa664121f4c2ef
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#646] Clean up docstrings for member_roles_list


  Commit: d779b485038d2027389ae9c907cbc143516cea61
      https://github.com/okfn/ckan/commit/d779b485038d2027389ae9c907cbc143516cea61
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1002] Better preview plugin selection


  Commit: 190951a1f30445f49d4db2dc2680fab582b12e85
      https://github.com/okfn/ckan/commit/190951a1f30445f49d4db2dc2680fab582b12e85
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/logic/auth/create.py

  Log Message:
  -----------
  [#729] Slight code refactor


  Commit: 4426a87ff6ad128787074ce20eb700dc4cf966bc
      https://github.com/okfn/ckan/commit/4426a87ff6ad128787074ce20eb700dc4cf966bc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1002] Fix failing tests


  Commit: 7517b85c03eec303e5dab29f31c5b3d91d98c929
      https://github.com/okfn/ckan/commit/7517b85c03eec303e5dab29f31c5b3d91d98c929
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#792] Remove file from coding standards blacklist


  Commit: af4e57cb65087f4964b08ce7f6a8fd7f999b1104
      https://github.com/okfn/ckan/commit/af4e57cb65087f4964b08ce7f6a8fd7f999b1104
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1024] remove stupid test that should never have existed


  Commit: 5422237aa647bc8d778d5f4c3eff55314f400bc2
      https://github.com/okfn/ckan/commit/5422237aa647bc8d778d5f4c3eff55314f400bc2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1002] Code cleanups to catch fixable plugins and reduce code duplication


  Commit: f9590e10bbcb90f3de5b125bd87993b7b517f030
      https://github.com/okfn/ckan/commit/f9590e10bbcb90f3de5b125bd87993b7b517f030
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1024] Fix test that was dependent on another test for it's data WTF


  Commit: 569121dea911cf282de75c50bc5d3170c36317fe
      https://github.com/okfn/ckan/commit/569121dea911cf282de75c50bc5d3170c36317fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#1002] Code fixes to changes


  Commit: 9ddb0e32a2bb0bf9e81e79160d53e6d9287f30a9
      https://github.com/okfn/ckan/commit/9ddb0e32a2bb0bf9e81e79160d53e6d9287f30a9
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/lib/celery_app.py

  Log Message:
  -----------
  [#1027] Fixes celery configuration to allow overriding from config


  Commit: c93f7f610feb1ea2034bfbfe4586f15361c1d84d
      https://github.com/okfn/ckan/commit/c93f7f610feb1ea2034bfbfe4586f15361c1d84d
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/lib/celery_app.py

  Log Message:
  -----------
  Removed trailing whitespace


  Commit: 09361a16dbb64f12fa15a8076768c31ca591139c
      https://github.com/okfn/ckan/commit/09361a16dbb64f12fa15a8076768c31ca591139c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/tests/test_coding_standards.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#1002] Update text/pdf previews to new method


  Commit: b3424e587e622ff1d345de8e6a80a1535bd6a514
      https://github.com/okfn/ckan/commit/b3424e587e622ff1d345de8e6a80a1535bd6a514
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M ckanext/pdfpreview/plugin.py
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1002] Some cleanups of the plugins since I was there


  Commit: 1d9a0c67ecdac7e1ff541830ddbece3bfa44ce27
      https://github.com/okfn/ckan/commit/1d9a0c67ecdac7e1ff541830ddbece3bfa44ce27
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merged master


  Commit: 69b0d881cb1147bb11b325d6afc4a009da3165ec
      https://github.com/okfn/ckan/commit/69b0d881cb1147bb11b325d6afc4a009da3165ec
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#890] Renaming of basic template blocks


  Commit: 855a1f6f91f72af27255c510686c663460ee0e89
      https://github.com/okfn/ckan/commit/855a1f6f91f72af27255c510686c663460ee0e89
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#715] Adds more logic to the  helper


  Commit: 1d68e165e288513259892aeb7cf9836d98ff4702
      https://github.com/okfn/ckan/commit/1d68e165e288513259892aeb7cf9836d98ff4702
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-21 (Fri, 21 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '1009-ValueError-when-resource-size-is-not-an-int'


  Commit: 3e553669e93b8eb1ee3ef5b0664f2519bfac76d0
      https://github.com/okfn/ckan/commit/3e553669e93b8eb1ee3ef5b0664f2519bfac76d0
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html

  Log Message:
  -----------
  Merge branch 'master' into 1007-IAuthenticator-extras


  Commit: 6c335c6aa1d0214f3dafa7d129b8e4064e4e6c98
      https://github.com/okfn/ckan/commit/6c335c6aa1d0214f3dafa7d129b8e4064e4e6c98
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/templates/header.html

  Log Message:
  -----------
  Merge branch '1007-IAuthenticator-extras'


  Commit: d6b239caaf277b79f16073c6d2dc6c89951b0fe5
      https://github.com/okfn/ckan/commit/d6b239caaf277b79f16073c6d2dc6c89951b0fe5
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html

  Log Message:
  -----------
  Merge branch 'master' into 1015-toolkit-updates


  Commit: 157542458fbaec1ffae9b84ee76ecd40306431df
      https://github.com/okfn/ckan/commit/157542458fbaec1ffae9b84ee76ecd40306431df
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    A doc/changelog.rst
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 851-relative-recline-url


  Commit: 9e523e08397d26cbe4c5da2f4e9980c0119b64b2
      https://github.com/okfn/ckan/commit/9e523e08397d26cbe4c5da2f4e9980c0119b64b2
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/plugins/toolkit.py
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' into 1024-search-changes


  Commit: faf6514389f2228e71c20e84fc3c7f480c6e9dc9
      https://github.com/okfn/ckan/commit/faf6514389f2228e71c20e84fc3c7f480c6e9dc9
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge pull request #851 from okfn/851-relative-recline-url

Recline preview does not work on ssl page


  Commit: 21ba17578bf2878710356cde98673f84f0fd4ba4
      https://github.com/okfn/ckan/commit/21ba17578bf2878710356cde98673f84f0fd4ba4
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: c06534a4a14f0beeeb33db5a05237c9fcda8182e
      https://github.com/okfn/ckan/commit/c06534a4a14f0beeeb33db5a05237c9fcda8182e
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1033] Fix validation in term_translation_update_many.

Now checks that data is present and that it is a list.


  Commit: 900fe841f40ab3c8c76aa525d6005251c05ea73d
      https://github.com/okfn/ckan/commit/900fe841f40ab3c8c76aa525d6005251c05ea73d
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#977] Look for locales in ckan.i18n_directory


  Commit: 8f1d572101b8bf6c302e2a0c20bc4abe0f571bd5
      https://github.com/okfn/ckan/commit/8f1d572101b8bf6c302e2a0c20bc4abe0f571bd5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Merge branch '977-locales-in-i18n-dir'


  Commit: 1d01f6987c63cb11d7f053de2f7edbe1b14cd6f9
      https://github.com/okfn/ckan/commit/1d01f6987c63cb11d7f053de2f7edbe1b14cd6f9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Merge branch '1033-term-translation-validation'


  Commit: 8fb8a7c7e5364c7d4c8e0432b7cd52404e2e8276
      https://github.com/okfn/ckan/commit/8fb8a7c7e5364c7d4c8e0432b7cd52404e2e8276
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1033] ValidationError.__str__ now uses error_dict instead of error_summary so this can go back to being a string.


  Commit: 0fb774029dc32bb074a62ce9e9f9c5fd557d522f
      https://github.com/okfn/ckan/commit/0fb774029dc32bb074a62ce9e9f9c5fd557d522f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/controllers/organization.py

  Log Message:
  -----------
  [#1036] Function was not defined


  Commit: 83762ddedd2a37d39c391cc55b78caf997d08d7d
      https://github.com/okfn/ckan/commit/83762ddedd2a37d39c391cc55b78caf997d08d7d
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/activity_streams.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/new_authz.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #970 from okfn/970-coding-standards-updates

Coding Standards update


  Commit: fd1258b9d10a2e1bf0f52604895bcdfc9658fcde
      https://github.com/okfn/ckan/commit/fd1258b9d10a2e1bf0f52604895bcdfc9658fcde
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    A doc/upgrading.rst
    A doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  merge origin/master


  Commit: 503c2ab44a63b201690a25505cae3ee18c316bac
      https://github.com/okfn/ckan/commit/503c2ab44a63b201690a25505cae3ee18c316bac
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R doc/changelog.rst

  Log Message:
  -----------
  Merge pull request #907 from okfn/907-datastore-permissions-fix-nested-type

Datastore fails on first query


  Commit: 56933c45133f47b3ae737e7717e29e38b237665c
      https://github.com/okfn/ckan/commit/56933c45133f47b3ae737e7717e29e38b237665c
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    A doc/upgrading.rst
    A doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merged master


  Commit: 247a1b8461cf5cdebc888b7fd363124464498f1f
      https://github.com/okfn/ckan/commit/247a1b8461cf5cdebc888b7fd363124464498f1f
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#715] Tweaks to  method


  Commit: 3577a19de8a0ccf9fccb7accd24ceff067d33911
      https://github.com/okfn/ckan/commit/3577a19de8a0ccf9fccb7accd24ceff067d33911
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/base_form_page.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read_base.html

  Log Message:
  -----------
  [#844] Tweaks to group member templates to be edit style

Makes group member style pages within the edit section of a group and adds tabs
to all edit pages.


  Commit: 25cdea387018486791b66fad9bce282b2dd2a65f
      https://github.com/okfn/ckan/commit/25cdea387018486791b66fad9bce282b2dd2a65f
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#890] Removed old template block that isn't needed anymore


  Commit: 135468323271b12bb2562795094bfbe29a26e32b
      https://github.com/okfn/ckan/commit/135468323271b12bb2562795094bfbe29a26e32b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  [#890] New get_action helper and remove package_show extra work


  Commit: 3dedaa5d4f3b3b2e886574df36d6da0280741f8b
      https://github.com/okfn/ckan/commit/3dedaa5d4f3b3b2e886574df36d6da0280741f8b
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    A ckan/public/base/less/search.less
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/search_form.html
    A ckan/templates/snippets/search_form.html

  Log Message:
  -----------
  Merge pull request #870 from okfn/870-search-snippets

Better search snippets


  Commit: 4dbebf9e27da44e18458bda185e837d9e3bdc5c4
      https://github.com/okfn/ckan/commit/4dbebf9e27da44e18458bda185e837d9e3bdc5c4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1040] fix license translation


  Commit: 53f1860c56876413996fb8c9600989d096ee1aa8
      https://github.com/okfn/ckan/commit/53f1860c56876413996fb8c9600989d096ee1aa8
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    A ckan/public/base/less/search.less
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/search_form.html
    A ckan/templates/snippets/search_form.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R doc/changelog.rst
    M doc/toolkit.rst

  Log Message:
  -----------
  Merged master


  Commit: 392ec18612bda50c5bb796f37440b07f15e3e75d
      https://github.com/okfn/ckan/commit/392ec18612bda50c5bb796f37440b07f15e3e75d
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Merge branch '725-sort-out-english'


  Commit: 46fbf97e009c5703650dbf8e8cc70f67c734d203
      https://github.com/okfn/ckan/commit/46fbf97e009c5703650dbf8e8cc70f67c734d203
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '890-button-ia'


  Commit: 155af713293d0d2969dea77eec363db66feb82ae
      https://github.com/okfn/ckan/commit/155af713293d0d2969dea77eec363db66feb82ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: be5413da3da13db709b6e9986c23a2700049a31b
      https://github.com/okfn/ckan/commit/be5413da3da13db709b6e9986c23a2700049a31b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 954-org-add-dataset-fix

Conflicts:
	ckan/logic/auth/create.py
	ckan/templates/organization/read_base.html
	ckan/tests/test_coding_standards.py


  Commit: e414929022e4cdcedbc029b2f17a043f2074a580
      https://github.com/okfn/ckan/commit/e414929022e4cdcedbc029b2f17a043f2074a580
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  Fix add dataset logic


  Commit: ab17fcdfc1dc188dcdaaeb03269a794ae106350f
      https://github.com/okfn/ckan/commit/ab17fcdfc1dc188dcdaaeb03269a794ae106350f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .gitmodules
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/test_tag_vocab_plugin.py
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/index.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 792-create-dataset-auth-improvement

Conflicts:
	ckan/logic/auth/create.py
	ckan/tests/test_coding_standards.py

    trivial


  Commit: 865f3c764a00f74a2db348385cec040b38914056
      https://github.com/okfn/ckan/commit/865f3c764a00f74a2db348385cec040b38914056
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/tests/test_coding_standards.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  Merge branch '1002-resource-preview-improvements'


  Commit: 584508f95dd565a42dc92402b6c7d9d108b3423d
      https://github.com/okfn/ckan/commit/584508f95dd565a42dc92402b6c7d9d108b3423d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .gitmodules
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/test_tag_vocab_plugin.py
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/index.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 715-resource-preview-ux-changes


  Commit: 8cdb4ca6e35ef50163f18301b7c7c8c68e0ebf59
      https://github.com/okfn/ckan/commit/8cdb4ca6e35ef50163f18301b7c7c8c68e0ebf59
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/organization.py

  Log Message:
  -----------
  Merge branch '1036-fix-broken-org-code'


  Commit: e2561007efde4aab327dcf798b68e36606c9691e
      https://github.com/okfn/ckan/commit/e2561007efde4aab327dcf798b68e36606c9691e
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch '1040-license-fix'


  Commit: b897af9fe8146871a7477a8d81e6ecd697a0fe66
      https://github.com/okfn/ckan/commit/b897af9fe8146871a7477a8d81e6ecd697a0fe66
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/tests/test_coding_standards.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  Merge branch 'master' into 715-resource-preview-ux-changes


  Commit: 11443325e5bc45a86a492558c51e871b97c2cd8b
      https://github.com/okfn/ckan/commit/11443325e5bc45a86a492558c51e871b97c2cd8b
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  [#1044] Removed debug display none


  Commit: 18397d5f5fd16ec963c0b210fdda768c44af5bfc
      https://github.com/okfn/ckan/commit/18397d5f5fd16ec963c0b210fdda768c44af5bfc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  [#715] Remove helper and do work in controller and minor tweaks


  Commit: 952f19968ffdfbf933462c5e9014be35054ecd61
      https://github.com/okfn/ckan/commit/952f19968ffdfbf933462c5e9014be35054ecd61
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: f1eebbefee62297f745fd8ba278089c8b619b5ea
      https://github.com/okfn/ckan/commit/f1eebbefee62297f745fd8ba278089c8b619b5ea
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html

  Log Message:
  -----------
  [#844] Make group members page more similar to organization members page

- When editing a member (as opposed to adding a new one):
  - Prefill username field, and make it non-editable
  - Prefill role field with user's current role
  - Add a delete button to the form
  - Label the submit button 'Save' rather than 'Add'


  Commit: d346ba045a2bdf22bd8f49daedecdde957ea9934
      https://github.com/okfn/ckan/commit/d346ba045a2bdf22bd8f49daedecdde957ea9934
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch '989-streaming-res-proxy'


  Commit: fca7c43ff569e8e2701bc92c85b98d4b5323dc13
      https://github.com/okfn/ckan/commit/fca7c43ff569e8e2701bc92c85b98d4b5323dc13
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#715] Fix can_be_previewed for embeds etc


  Commit: 63db0ebfaad26b0087ffcd872aeb11504ec84412
      https://github.com/okfn/ckan/commit/63db0ebfaad26b0087ffcd872aeb11504ec84412
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#715] Further cleanups


  Commit: a84d97aad9e83431f92126f884137055e1e8dc3f
      https://github.com/okfn/ckan/commit/a84d97aad9e83431f92126f884137055e1e8dc3f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  Merge branch '954-org-add-dataset-fix'


  Commit: 6aace014601ae6aad99c9c638cb115ac36958685
      https://github.com/okfn/ckan/commit/6aace014601ae6aad99c9c638cb115ac36958685
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/members.html

  Log Message:
  -----------
  [#844] Small textual and template tweaks


  Commit: 344d99e8d13723cef5af3fb58c42096307afb882
      https://github.com/okfn/ckan/commit/344d99e8d13723cef5af3fb58c42096307afb882
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    A doc/upgrading.rst
    A doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merged master


  Commit: 1b222123d1f00acd70c95e2c28ca32905042a59c
      https://github.com/okfn/ckan/commit/1b222123d1f00acd70c95e2c28ca32905042a59c
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [#844] Tweaks to blocks from new templates


  Commit: 3a3fff86417f5150add88bd7e93871a448e2a875
      https://github.com/okfn/ckan/commit/3a3fff86417f5150add88bd7e93871a448e2a875
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/lib/celery_app.py

  Log Message:
  -----------
  Merge branch '1027-celery-configuration'


  Commit: 5e2212117a6ba872437111e760f5bff733b27dfb
      https://github.com/okfn/ckan/commit/5e2212117a6ba872437111e760f5bff733b27dfb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#646] Tweak member_roles_list docstring


  Commit: 4c85bd19a3e1050d6dcbe127c00a2756b792fee7
      https://github.com/okfn/ckan/commit/4c85bd19a3e1050d6dcbe127c00a2756b792fee7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/prose.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    A doc/upgrading.rst
    A doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 646-undocumented-action-functions


  Commit: fc469a291c3313eb8666c8d51a592a7e7d9399a8
      https://github.com/okfn/ckan/commit/fc469a291c3313eb8666c8d51a592a7e7d9399a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html

  Log Message:
  -----------
  Merge branch '844-group-members'


  Commit: eeb33b7b47809c8d30021e97e67a511b9cb7c7ec
      https://github.com/okfn/ckan/commit/eeb33b7b47809c8d30021e97e67a511b9cb7c7ec
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for 2.2a


  Commit: a4f0cf611070629addd14f0b63526729f2dcd467
      https://github.com/okfn/ckan/commit/a4f0cf611070629addd14f0b63526729f2dcd467
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  package_list performance fix


  Commit: 32589077a90a02056a681846bdb70a69e8b30c5b
      https://github.com/okfn/ckan/commit/32589077a90a02056a681846bdb70a69e8b30c5b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  package_list: return sorted by name


  Commit: 85c844c894c91c30b1d81a64e56470d5f00ad73d
      https://github.com/okfn/ckan/commit/85c844c894c91c30b1d81a64e56470d5f00ad73d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  fix for package_list returning nested list


  Commit: 173c3a090f3200bc7be18f33c3fd09408406d61c
      https://github.com/okfn/ckan/commit/173c3a090f3200bc7be18f33c3fd09408406d61c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  package_list: use context['model'] instead of import, from @tobes


  Commit: 493745b6af2ef64be1e95032be5e87eee7bad889
      https://github.com/okfn/ckan/commit/493745b6af2ef64be1e95032be5e87eee7bad889
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/routing.py
    M ckan/lib/celery_app.py
    M ckan/logic/auth/create.py
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/read.html
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: d0840c2c3c70cde54121b9fb1716647736ba32e5
      https://github.com/okfn/ckan/commit/d0840c2c3c70cde54121b9fb1716647736ba32e5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '646-undocumented-action-functions'


  Commit: b2bcc99b11bf6293dca51ecbe8241dde8268785f
      https://github.com/okfn/ckan/commit/b2bcc99b11bf6293dca51ecbe8241dde8268785f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into resource_update-use-package_update


  Commit: e99500be389551655b139e8bfacec3ed0f5fae14
      https://github.com/okfn/ckan/commit/e99500be389551655b139e8bfacec3ed0f5fae14
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  Merge pull request #715 from okfn/715-resource-preview-ux-changes

Change UX behaviour when displaying an external resource which can't be previewed


  Commit: fd05521b4f7bc79648cd42f77b24b16c97240acf
      https://github.com/okfn/ckan/commit/fd05521b4f7bc79648cd42f77b24b16c97240acf
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    A ckan/templates/organization/snippets/helper.html

  Log Message:
  -----------
  [#1056] Fix for 500 error on group create page

Also fixes for:
* Group/Org edit template: added missing context in sidebar
* Group/Org new template: added missing helper text
* Small template refactors: moving group context info into snippet and also
group/org helpers into snippets


  Commit: b2a3d479e61eb482d34b8c55c9df8d1455c49564
      https://github.com/okfn/ckan/commit/b2a3d479e61eb482d34b8c55c9df8d1455c49564
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    A ckan/templates/organization/snippets/helper.html

  Log Message:
  -----------
  Merge branch '1056-group-template-fixes'


  Commit: 3fb00b6735b5443a6f5be9192e048e4b57e92687
      https://github.com/okfn/ckan/commit/3fb00b6735b5443a6f5be9192e048e4b57e92687
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1052] Add CHANGELOG item about IPackageController change


  Commit: 8edbdbd7049e23024c29d5ce9b5020d5db381db2
      https://github.com/okfn/ckan/commit/8edbdbd7049e23024c29d5ce9b5020d5db381db2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into resource_update-use-package_update


  Commit: 74d185fb6fa4dc81b040cc955ffffdd90b8fff0c
      https://github.com/okfn/ckan/commit/74d185fb6fa4dc81b040cc955ffffdd90b8fff0c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/action/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'resource_update-use-package_update'


  Commit: 4fb90b54e3e56fcf61dfd590c5446bebe4a312d6
      https://github.com/okfn/ckan/commit/4fb90b54e3e56fcf61dfd590c5446bebe4a312d6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge pull request #792 from okfn/792-create-dataset-auth-improvement

"Add Dataset" button shows when you can't use it


  Commit: 8d55e1342131acb3e24bdcb310ade6ed3482f1e2
      https://github.com/okfn/ckan/commit/8d55e1342131acb3e24bdcb310ade6ed3482f1e2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    R doc/changelog.rst
    M doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' into 707-implement-group-purging


Compare: https://github.com/okfn/ckan/compare/aa0c9f851fbf...8d55e1342131

• Previous message: [ckan-changes] [okfn/ckan] c08955: Test to find undocumented action functions
• Next message: [ckan-changes] [okfn/ckan] c08955: Test to find undocumented action functions
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]