[ckan-changes] [okfn/ckan] a6d08d: [#226] Implemented generic text highlighter for JS...

GitHub noreply at github.com
Mon Jun 3 16:06:21 UTC 2013


  Branch: refs/heads/690-url-for-static-fix
  Home:   https://github.com/okfn/ckan
  Commit: a6d08d686a4ee008884cd7c51299b26767900851
      https://github.com/okfn/ckan/commit/a6d08d686a4ee008884cd7c51299b26767900851
  Author: matthias <matthias at thinkpad.(none)>
  Date:   2013-02-23 (Sat, 23 Feb 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    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/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    A ckanext/texthighlighter/__init__.py
    A ckanext/texthighlighter/plugin.py
    A ckanext/texthighlighter/tests/__init__.py
    A ckanext/texthighlighter/tests/test_preview.py
    A ckanext/texthighlighter/theme/public/css/texthighlighter.css
    A ckanext/texthighlighter/theme/public/highlight.pack.js
    A ckanext/texthighlighter/theme/public/preview.js
    A ckanext/texthighlighter/theme/public/resource.config
    A ckanext/texthighlighter/theme/public/styles/default.css
    A ckanext/texthighlighter/theme/templates/texthighlighter.html
    M setup.py

  Log Message:
  -----------
  [#226] Implemented generic text highlighter for JSON, XML and plain text. Deleted jsonpreview.


  Commit: 9c96640b0cbf8936d51a06e315ad58de0b0b6406
      https://github.com/okfn/ckan/commit/9c96640b0cbf8936d51a06e315ad58de0b0b6406
  Author: Jossekin <beilharz at acm.org>
  Date:   2013-02-23 (Sat, 23 Feb 2013)

  Changed paths:
    M ckanext/texthighlighter/theme/public/css/texthighlighter.css
    M ckanext/texthighlighter/theme/public/preview.js
    M ckanext/texthighlighter/theme/public/resource.config

  Log Message:
  -----------
  unified indentation


  Commit: 379f8164ca114274d3f6ab0b65c066323dd2fb4c
      https://github.com/okfn/ckan/commit/379f8164ca114274d3f6ab0b65c066323dd2fb4c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    R ckanext/texthighlighter/__init__.py
    R ckanext/texthighlighter/plugin.py
    R ckanext/texthighlighter/tests/__init__.py
    R ckanext/texthighlighter/tests/test_preview.py
    R ckanext/texthighlighter/theme/public/css/texthighlighter.css
    R ckanext/texthighlighter/theme/public/highlight.pack.js
    R ckanext/texthighlighter/theme/public/preview.js
    R ckanext/texthighlighter/theme/public/resource.config
    R ckanext/texthighlighter/theme/public/styles/default.css
    R ckanext/texthighlighter/theme/templates/texthighlighter.html
    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/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/templates/text.html
    M setup.py

  Log Message:
  -----------
  [#226] Rename text highligher extension to text preview


  Commit: 0259bff651e09d055b3835e66ca079d100f217e3
      https://github.com/okfn/ckan/commit/0259bff651e09d055b3835e66ca079d100f217e3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    A ckanext/textpreview/theme/public/LICENSE

  Log Message:
  -----------
  [#226] Add missing license for highlight.js


  Commit: 2110146771f69f22cd9a5e93dfd9a89bf8640964
      https://github.com/okfn/ckan/commit/2110146771f69f22cd9a5e93dfd9a89bf8640964
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/github.css

  Log Message:
  -----------
  [#226] Use github style


  Commit: bd5756380c7cb1df14ad6aae097dc7168b18874f
      https://github.com/okfn/ckan/commit/bd5756380c7cb1df14ad6aae097dc7168b18874f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M ckanext/textpreview/theme/public/preview.js

  Log Message:
  -----------
  [#226] Make jsonp preview more resistant, add missing converter to jsonp


  Commit: 49c437c0e1cb9b2f61cf5288a0a17a007220ff5d
      https://github.com/okfn/ckan/commit/49c437c0e1cb9b2f61cf5288a0a17a007220ff5d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#226] Rename text preview tests, add test for whether css is present


  Commit: c5e649673e67c66a8c5ec63863c8c26d6b0d95ba
      https://github.com/okfn/ckan/commit/c5e649673e67c66a8c5ec63863c8c26d6b0d95ba
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/theme/public/preview.js

  Log Message:
  -----------
  [#226] Make it easier to add new formats to the json/xml/text preview


  Commit: edcf8f06d7ec75dd514325510202a5062fb0334c
      https://github.com/okfn/ckan/commit/edcf8f06d7ec75dd514325510202a5062fb0334c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/api.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/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.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/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    A ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/client.js
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    M ckan/public/base/javascript/main.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    M ckan/public/base/javascript/modules/autocomplete.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.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/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.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/help.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.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/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    M ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/resourceproxy/controller.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/tests/test_preview.py
    R ckanext/textpreview/theme/public/preview.js
    A ckanext/textpreview/theme/public/preview_text.js
    M ckanext/textpreview/theme/public/resource.config
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 226-text-highlighting

Conflicts:
	ckanext/textpreview/tests/test_preview.py


  Commit: 4c95b4b0b8d28a72e9d247a69e20a215d3d00222
      https://github.com/okfn/ckan/commit/4c95b4b0b8d28a72e9d247a69e20a215d3d00222
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  [#764] Install vdm from the Python Package Index

Makes easier to install CKAN on offline environments


  Commit: 3496639dcf241057d204023e1a864ef5af1d0ef2
      https://github.com/okfn/ckan/commit/3496639dcf241057d204023e1a864ef5af1d0ef2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 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/activity_streams_session_extension.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/forms.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/footer.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/new_package_metadata.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
    A 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/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_activity.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
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.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
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    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 pip-requirements-test.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 226-text-highlighting

Conflicts:
	ckan/config/deployment.ini_tmpl


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#226] Fix merge


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

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#226] Preview geojson with json preview


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

  Changed paths:
    M ckanext/textpreview/theme/public/preview_text.js

  Log Message:
  -----------
  [#226] Make ajax request for preview async to prevent the request from blocking the ui


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

  Changed paths:
    M ckanext/textpreview/theme/public/preview_text.js

  Log Message:
  -----------
  [#226] Show original error message, if possible, instead of a not very helpful default message.


  Commit: c73a1ce8977e22b6cc819e083dd6fe90019231c2
      https://github.com/okfn/ckan/commit/c73a1ce8977e22b6cc819e083dd6fe90019231c2
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  Added some documentation for package_create

The owner_org parameter of package_create was not documented,
so I have added some documentation for it.


  Commit: f34ddbfc3fa67100419230c19535de109be11214
      https://github.com/okfn/ckan/commit/f34ddbfc3fa67100419230c19535de109be11214
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  Fix documentation to match the API spelling.


  Commit: 172563b084c79aba3ddf96549dc572b11216b7dd
      https://github.com/okfn/ckan/commit/172563b084c79aba3ddf96549dc572b11216b7dd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    R doc/CHANGELOG.rst
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/changelog.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
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.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/release-cycle.rst
    M doc/release-process.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst

  Log Message:
  -----------
  [#769] Huge docs reorganization

The main changes are:

- Completely redesigned the main table of contents. This is intended to
  be a much simpler, clearer, more linear structure, both for readers to
  find their way and for developers to know where to add new docs.

- New "Installing" page that links to all the pages about
  installing/deploying/upgrading package installs and source installs.
  This is needed mainly so we have somewhere to explain the choice
  between package and source install.

- Move "Upgrading a Package Install to CKAN 2.0" and "Upgrading a Source
  Install" onto their own pages. These should be merged into a single
  "Upgrading CKAN" page in the future.

- Rename the "Deployment" page to "Deploying a Source Install", you
  don't need to do it for package installs.

- Renamed the "Post-Installation Setup" page to "Getting Started", moved some
  stuff from the "Theming" page to here, edited the page, adding a
  screenshot. This page could probably be improved a lot.

- Rename the "CKAN Paster Commands" page to "Command Line Interface" and
  rewrite it. It should be much clearer about how to use and
  troubleshoot paster commands now.

  Also move the paster commands reference into the same page, so all CLI
  docs are on one page.

  Moved this page much higher up in the table of contents so people
  should find out shortly after doing either a package or source
  install, how to run paster commands.

- Deleted the "Database Dumps" page, this was double-documented in the Paster
  Commands Reference, I merged the differences in.

- Deleted the "Extensions" page. We now just have a "Features" section
  that lists every core feature and core extension (each has its own
  page).

  Users don't care whether something is a core feature or a core
  extension, they just want to know what it does and how to use it.

  Writing extensions is still covered on the "Writing Extensions" page.

- Moved all the FileStore stuff (overview, setup, API) onto one
  FileStore page.

- Moved all the datastore docs: overview, setup, api onto one page.
  Moved datastore API reference docs from Action API page into datastore
  page.

- Delete the "Importing Datasets" page. Move the API example from this page onto
  the API page.

- Added module-level docstrings to the files in ckan/logic/action/*.py,
  for the benefit of the action API reference docs

- Put the Action API reference docs back onto the same page with the API
  overview docs, instead of splitting it all across 5 pages.

- Rewrote the CONTRIBUTING file, it now contains everything: reporting
  issues, translating, all the different coding standards, commit
  messages, frontend development guidelines, writing documentation,
  making and merging pull requests ... all in one place.

- Renamed CKAN Code Architecture to CKAN Coding Standards

- Renamed the "Testing for Developers" page to "Testing CKAN"

- Moved the "Frontend Testing" page into the "Testing CKAN" page, so now
  all the docs about testing are on one page.

- Deleted the "Common Error Messages" page. I moved some of the error messages
  to other places, the rest of them looked no longer relevant.

- Deleted the "Publishing Datasets" page. Just deleted it.

- Lots of editing all over the place, but much more is needed.


  Commit: ace5c30d6505bd99b8bb62bd2d3b57f1478db31c
      https://github.com/okfn/ckan/commit/ace5c30d6505bd99b8bb62bd2d3b57f1478db31c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#769] Change docs sidebar contents

- Show Next Page and Prev Page links in sidebar

- Don't show the current page's table of contents in the sidebar,
  this is already contained (and expanded) within the global table of contents
  that's already shown in the sidebar

- Don't show the table of contents in the sidebar, on the table of contents
  page!


  Commit: 6273f17abb88c995ecdb5092348b34fc92914d5b
      https://github.com/okfn/ckan/commit/6273f17abb88c995ecdb5092348b34fc92914d5b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M CHANGELOG.rst
    R doc/changelog.rst
    M doc/index.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  [#769] Collect all release docs onto one page

Collect the release types, release cycle, release process etc. and
changelog together into one releases page. Also edited the text on this
page.


  Commit: 5ac5da0369751c13633e5649b65804cc095b232b
      https://github.com/okfn/ckan/commit/5ac5da0369751c13633e5649b65804cc095b232b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M doc/features.rst
    M doc/index.rst

  Log Message:
  -----------
  [#769] Move command line interface docs into features section


  Commit: 3324cfea4846a1a9c0bf934aea5b77ae5332c329
      https://github.com/okfn/ckan/commit/3324cfea4846a1a9c0bf934aea5b77ae5332c329
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#769] Move config options ref further down in docs


  Commit: 4fd263a56e3d0c702b1801d581853fcae3dfac93
      https://github.com/okfn/ckan/commit/4fd263a56e3d0c702b1801d581853fcae3dfac93
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-28 (Tue, 28 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/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    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
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M doc/datastore-api.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 226-text-highlighting


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/theme/public/preview_text.js
    M setup.py

  Log Message:
  -----------
  [#226] PEP8 and load jpeg direktly as well


  Commit: 0972ae57c4c3aa113488846f165c22c2eadffbf2
      https://github.com/okfn/ckan/commit/0972ae57c4c3aa113488846f165c22c2eadffbf2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/theme/public/preview_text.js
    M ckanext/textpreview/theme/templates/text.html

  Log Message:
  -----------
  [#226] Make the formats configurable


  Commit: 19d3c78a9cf4aa0a99a33ef57d4d1064cc11372d
      https://github.com/okfn/ckan/commit/19d3c78a9cf4aa0a99a33ef57d4d1064cc11372d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 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/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    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/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
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M doc/datastore-api.rst
    M doc/release-process.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 226-text-highlighting


  Commit: 32d041b9ab9a0d59c56d3689ba96f6779ad89a89
      https://github.com/okfn/ckan/commit/32d041b9ab9a0d59c56d3689ba96f6779ad89a89
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#226] Update data viewer docs


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

  Changed paths:
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#226] Fix PEP8


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

  Log Message:
  -----------
  Merge branch '226-text-highlighting' of github.com:okfn/ckan into 226-text-highlighting


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

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#226] PEP8


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

  Changed paths:
    M ckanext/textpreview/theme/public/preview_text.js
    M ckanext/textpreview/theme/templates/text.html

  Log Message:
  -----------
  [#226] Fix typo


  Commit: 64dc4a96fbf89311cf26349fcd96aaead1867cce
      https://github.com/okfn/ckan/commit/64dc4a96fbf89311cf26349fcd96aaead1867cce
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#226] Update configuration docs


  Commit: f4450f7ed310e3ce0ff1049b252b8f09443541c6
      https://github.com/okfn/ckan/commit/f4450f7ed310e3ce0ff1049b252b8f09443541c6
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#226] Minor tweaks in docs


  Commit: 3f2d2edb3155c08fac2b1e183a879231c83e4f25
      https://github.com/okfn/ckan/commit/3f2d2edb3155c08fac2b1e183a879231c83e4f25
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/tests/test_coding_standards.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
    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
    M doc/configuration.rst
    M doc/data-viewer.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '226-text-highlighting'


  Commit: 5f62ced8f9e4765eabf6672b69117684a5ab70f7
      https://github.com/okfn/ckan/commit/5f62ced8f9e4765eabf6672b69117684a5ab70f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  [#952] Create site user at startup


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#913] Fix url creation of qualified sub dirs


  Commit: 4b75a084be9cb7577676e3396dd80b1eeaf48477
      https://github.com/okfn/ckan/commit/4b75a084be9cb7577676e3396dd80b1eeaf48477
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    R doc/CHANGELOG.rst
    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
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.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
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst

  Log Message:
  -----------
  Merge branch '769-docs-reorg'

Conflicts:
	doc/datastore-api.rst


  Commit: a911535c5dcacddac424463007649dead57c85a2
      https://github.com/okfn/ckan/commit/a911535c5dcacddac424463007649dead57c85a2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M doc/conf.py
    A doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/python-coding-standards.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#942] Add documentation guidelines


  Commit: be164c03f261ef0472c356190384e8173f06c738
      https://github.com/okfn/ckan/commit/be164c03f261ef0472c356190384e8173f06c738
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Typo


  Commit: ab2975db183434c080e2fd93373e5428115a6b57
      https://github.com/okfn/ckan/commit/ab2975db183434c080e2fd93373e5428115a6b57
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#942] Fix broken toctree in docs


  Commit: 5a9af1b880249694e4ce6ae5c7eee3bd4c85ad96
      https://github.com/okfn/ckan/commit/5a9af1b880249694e4ce6ae5c7eee3bd4c85ad96
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Typo


  Commit: bc60fce5fab391f664be2b5db471957e7e2ef563
      https://github.com/okfn/ckan/commit/bc60fce5fab391f664be2b5db471957e7e2ef563
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Move Commonly Used Terms higher up

in documentation guidelines


  Commit: d60eec2afb2b13d2b57840218c77577a925a42bf
      https://github.com/okfn/ckan/commit/d60eec2afb2b13d2b57840218c77577a925a42bf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Add cross-referencing and linking examples


  Commit: ef6bf3bcbe27c87dcc396088edb16a349f072ac3
      https://github.com/okfn/ckan/commit/ef6bf3bcbe27c87dcc396088edb16a349f072ac3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Add Sphinx seealso example


  Commit: da7b7801c0095b2aefd244c71f1edaf41a306c92
      https://github.com/okfn/ckan/commit/da7b7801c0095b2aefd244c71f1edaf41a306c92
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  [#942] Don't use literals in section titles

It looks weird because the OKFN Sphinx theme colours them red.


  Commit: 9d4dde9550c1f50bbaf67a4bc8a9f3bb39dc6958
      https://github.com/okfn/ckan/commit/9d4dde9550c1f50bbaf67a4bc8a9f3bb39dc6958
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  Merge pull request #764 from okfn/764-vdm-from-pypi

Make vdm 0.11 a PyPI package dependency


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

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#952] Add try for when db is not initialised


  Commit: 9789d767cad5487437f8547ed9f0c1ceec2d4c01
      https://github.com/okfn/ckan/commit/9789d767cad5487437f8547ed9f0c1ceec2d4c01
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [#900] Fix Czech translation

There were wrong keys in some of the strings that raised an exception on
the resource page. Also updated the translations on Transifex.


  Commit: 8d126f4898534c994469cb300067d834e12ce8dc
      https://github.com/okfn/ckan/commit/8d126f4898534c994469cb300067d834e12ce8dc
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

  Log Message:
  -----------
  Fix typo dispaly -> display


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

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

  Log Message:
  -----------
  Merge pull request #918 from morty/feature-document-owner-org-parameter-for-package-create

Added some documentation for package_create


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '913-fix-url-creation'


  Commit: 23008420ec10e58915201add0e6c5e629434bacb
      https://github.com/okfn/ckan/commit/23008420ec10e58915201add0e6c5e629434bacb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Merge branch '952-create-site-user-at-startup'


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

  Changed paths:
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.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/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/test_coding_standards.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
    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
    R doc/CHANGELOG.rst
    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
    A doc/releases.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 690-url-for-static-fix


Compare: https://github.com/okfn/ckan/compare/02663660de57...7e7cf40877bb


More information about the ckan-changes mailing list