[ckan-changes] [ckan/ckan] 9fadea: [#1350] resource format change

• Previous message: [ckan-changes] [ckan/ckan] a3c5e5: [#1573] Add new translations policy to docs
• Next message: [ckan-changes] [ckan/ckan] 9fadea: [#1350] resource format change
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/1505-invite-to-organization-causes-error
  Home:   https://github.com/ckan/ckan
  Commit: 9fadea50e08379164ab1b1070544f9795c80a669
      https://github.com/ckan/ckan/commit/9fadea50e08379164ab1b1070544f9795c80a669
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    A ckan/config/resource_formats.json
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    M doc/configuration.rst

  Log Message:
  -----------
  [#1350] resource format change


  Commit: ebde6921cf89d5997b058969a4d92a096e90cda2
      https://github.com/ckan/ckan/commit/ebde6921cf89d5997b058969a4d92a096e90cda2
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-24 (Tue, 24 Dec 2013)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1332] Makes markdown link a popover with context of CKAN flavoured markdown


  Commit: 0f63dcc286258dd44f575259bf89aa913f91eff7
      https://github.com/ckan/ckan/commit/0f63dcc286258dd44f575259bf89aa913f91eff7
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  [#1330] Get user ids from a list of ids or names


  Commit: 001d7c6a36de08f7c520f009ce695ef943c1d276
      https://github.com/ckan/ckan/commit/001d7c6a36de08f7c520f009ce695ef943c1d276
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1330] Filter activity from specified users


  Commit: d6486a1c936a3faa037b6a8e2d34d8c52ab7e4d3
      https://github.com/ckan/ckan/commit/d6486a1c936a3faa037b6a8e2d34d8c52ab7e4d3
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst

  Log Message:
  -----------
  [#1330] Update documentation


  Commit: 48b95baf3539fef336c4d45b558763cc600c7d28
      https://github.com/ckan/ckan/commit/48b95baf3539fef336c4d45b558763cc600c7d28
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1330] Use actual value of site_id for default


  Commit: cdcdf8aa3bcdc5428f9d20079c941d7bc25c6041
      https://github.com/ckan/ckan/commit/cdcdf8aa3bcdc5428f9d20079c941d7bc25c6041
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

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

  Log Message:
  -----------
  [#1330] Fix test failures


  Commit: e150204cebbbcb3eb00a430451bfc7112616e0dc
      https://github.com/ckan/ckan/commit/e150204cebbbcb3eb00a430451bfc7112616e0dc
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

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

  Log Message:
  -----------
  pep8 fix for test failure


  Commit: 66232326b15066c57478cf3aa7dc01ab5a367a15
      https://github.com/ckan/ckan/commit/66232326b15066c57478cf3aa7dc01ab5a367a15
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

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

  Log Message:
  -----------
  Update action function and documentation

* Split the helper function into two functions.
* Add better docstrings.
* Improve the documentation and explain about site user.


  Commit: 24258d27613ea1032f98ec52f88aec5b6052ce30
      https://github.com/ckan/ckan/commit/24258d27613ea1032f98ec52f88aec5b6052ce30
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

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

  Log Message:
  -----------
  Fix tiny error.


  Commit: 85ec5302b7a68243c033d83ee7a22364089f51be
      https://github.com/ckan/ckan/commit/85ec5302b7a68243c033d83ee7a22364089f51be
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Enable `hide_activity_from_users` by default


  Commit: a3c5e57f6af934fd917bd4a8e32d449236f1862f
      https://github.com/ckan/ckan/commit/a3c5e57f6af934fd917bd4a8e32d449236f1862f
  Author: amercader <amercadero at gmail.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M doc/contributing/i18n.rst
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  [#1573] Add new translations policy to docs


  Commit: 21d434e17b1ea943921f5a19bf650df6bcc85f77
      https://github.com/ckan/ckan/commit/21d434e17b1ea943921f5a19bf650df6bcc85f77
  Author: Ian Ward <ian at excess.org>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1583] don't replace action functions with calls to get_action


  Commit: c054d3be7aba38d5bfa98d1d52baa7c04efbae17
      https://github.com/ckan/ckan/commit/c054d3be7aba38d5bfa98d1d52baa7c04efbae17
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  [#1584] Don't lowercase names of uploaded files


  Commit: 36513ad1e44b3fe044efb47e3e18395bce995e77
      https://github.com/ckan/ckan/commit/36513ad1e44b3fe044efb47e3e18395bce995e77
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/helpers.py
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/resource_form.html
    M doc/configuration.rst

  Log Message:
  -----------
  [#1350] change format of input file and fix some typos


  Commit: f295486e0d6f6d27c772b09bf3c3c502f93ef1dd
      https://github.com/ckan/ckan/commit/f295486e0d6f6d27c772b09bf3c3c502f93ef1dd
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.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/edit_base.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html

  Log Message:
  -----------
  [#1350] merge conflicts


  Commit: c241483798aee79ab3f38cd5737d1cb9aae1af44
      https://github.com/ckan/ckan/commit/c241483798aee79ab3f38cd5737d1cb9aae1af44
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  [#1350]  Fix typos and add geojson type


  Commit: 3e16411bdf9ab07f93f86a0195cc9abdc8a905ae
      https://github.com/ckan/ckan/commit/3e16411bdf9ab07f93f86a0195cc9abdc8a905ae
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/controllers/package.py
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' into 1350-resource-format-change


  Commit: d06cfbe35caeed15db8e9e611fe6d3ff81942e0e
      https://github.com/ckan/ckan/commit/d06cfbe35caeed15db8e9e611fe6d3ff81942e0e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1330-hide-activity-stream

Conflicts:
	ckan/logic/action/get.py
	ckanext/textpreview/tests/test_preview.py


  Commit: edb771e17e842fd422e8e6d4fd2f52acb32d0c24
      https://github.com/ckan/ckan/commit/edb771e17e842fd422e8e6d4fd2f52acb32d0c24
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '1330-hide-activity-stream'


  Commit: 690a21ee961752058254f118ed9c64f3d34f8d24
      https://github.com/ckan/ckan/commit/690a21ee961752058254f118ed9c64f3d34f8d24
  Author: Rishi Verma <riverma at gmail.com>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Update paster.rst

Added tip on using 'sudo' to overcome permission denied error when invoking 'paster db clean ..'.


  Commit: 018923948da08c10c4473926ae692e597d2daa71
      https://github.com/ckan/ckan/commit/018923948da08c10c4473926ae692e597d2daa71
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1609] extra blocks broke facets, add another with block to fix


  Commit: b7d15314b0c6acf2cb87fd64c882103adca23bf5
      https://github.com/ckan/ckan/commit/b7d15314b0c6acf2cb87fd64c882103adca23bf5
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  Merge pull request #1584 from ckan/1584-dont-lowercase-names-of-uploaded-files

Don't lowercase the names of uploaded files


  Commit: e78413e25fef4285280a460964672098e830071d
      https://github.com/ckan/ckan/commit/e78413e25fef4285280a460964672098e830071d
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #1583 from wardi/dont-replace-action-functions

don't replace action functions with calls to get_action


  Commit: aebc52ca8bf9e4384b6171478923e19b178012a6
      https://github.com/ckan/ckan/commit/aebc52ca8bf9e4384b6171478923e19b178012a6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  Merge pull request #1609 from ckan/1609-facets-not-showing

[#1609] Fix Regression on facets


  Commit: 32c1153a8c6ce06baa59ab4508ff780e7a82946b
      https://github.com/ckan/ckan/commit/32c1153a8c6ce06baa59ab4508ff780e7a82946b
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1419] Move URL locality checking to helpers

This allows the function to be also used for similar purposes outside
the user controller.

Also rename the function to be more descriptive in this general
setting.


  Commit: 6c99806708194447d69fc4f4d16bc70340055f66
      https://github.com/ckan/ckan/commit/6c99806708194447d69fc4f4d16bc70340055f66
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#1419] Check that redirection target is local


  Commit: e18a24dbaf4570c611dfaf29025b1016646a3af0
      https://github.com/ckan/ckan/commit/e18a24dbaf4570c611dfaf29025b1016646a3af0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_resource_search.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1350] Added uniqueness constraint to mimetypes to avoid ambiguity.


  Commit: 7587c6e8fe49c809ef7357b6f88496bd06ac93b9
      https://github.com/ckan/ckan/commit/7587c6e8fe49c809ef7357b6f88496bd06ac93b9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A ckan/config/resource_formats.json
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #1350 from ckan/1350-resource-format-change

[#1350] Resource format not guessed automatically


  Commit: 43d42dede2a376b0d65afb850b49065708d4f257
      https://github.com/ckan/ckan/commit/43d42dede2a376b0d65afb850b49065708d4f257
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#1419] Abort with 403 when attempting external redirect


  Commit: e6c567c3918972feb0484967a0ee03551415787f
      https://github.com/ckan/ckan/commit/e6c567c3918972feb0484967a0ee03551415787f
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Now installing *.json files from configuration too

Otherwise, ``resource_formats.json`` wouldn't get installed by ``pip install``, causing this kind of issues: http://paste.pound-python.org/show/OlykESJdUBcEw3SgJ7aA/


  Commit: 92b5fea9a5c7c54367bac4fc55fa6338a18f6e81
      https://github.com/ckan/ckan/commit/92b5fea9a5c7c54367bac4fc55fa6338a18f6e81
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py
    M ckan/lib/helpers.py
    A ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  [#1419] Better status for when no param supplied. Added test.


  Commit: a97c90bfc5f134391c2dc3a8ee39ad24185a6abb
      https://github.com/ckan/ckan/commit/a97c90bfc5f134391c2dc3a8ee39ad24185a6abb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/lib/helpers.py
    A ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  Merge branch 'pr/1613'


  Commit: 894a3c46906da9d7a2445c0eb79d4edc353a6c9e
      https://github.com/ckan/ckan/commit/894a3c46906da9d7a2445c0eb79d4edc353a6c9e
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge pull request #1618 from rshk/patch-1

Now installing *.json files from configuration too


  Commit: 0be7c69fbf100df7f641dc0affe69be07a11b751
      https://github.com/ckan/ckan/commit/0be7c69fbf100df7f641dc0affe69be07a11b751
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1332] Not sure it is a flavour unique to CKAN - just said HTML is stripped. Added link example.


  Commit: 0aedc7273cacb15830181d2a044682a3d04c6551
      https://github.com/ckan/ckan/commit/0aedc7273cacb15830181d2a044682a3d04c6551
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  Merge branch '1332-markdown'


  Commit: f5475e4a43e39eac7420ce0aaee3cdd5f98869c0
      https://github.com/ckan/ckan/commit/f5475e4a43e39eac7420ce0aaee3cdd5f98869c0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  [#1332] Fix bad import in test.


  Commit: c0a38df396ed192ecc919b8a4a1930a9bc4ea352
      https://github.com/ckan/ckan/commit/c0a38df396ed192ecc919b8a4a1930a9bc4ea352
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'riverma/patch-1' into 1607-paster-doc


  Commit: 80ac196cc604229d747e0dc2e7797a5d1dc2244f
      https://github.com/ckan/ckan/commit/80ac196cc604229d747e0dc2e7797a5d1dc2244f
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Move the docs to Troubleshooting

Fixes #1607


  Commit: a3a7230e58f1868efa23658124c8cc2be55d0937
      https://github.com/ckan/ckan/commit/a3a7230e58f1868efa23658124c8cc2be55d0937
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#1576] Change api doc url to new one


  Commit: e7775a3c8a68c1621c86d972a509383af3c236cf
      https://github.com/ckan/ckan/commit/e7775a3c8a68c1621c86d972a509383af3c236cf
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/templates/package/search.html

  Log Message:
  -----------
  Merge pull request #1621 from ckan/1576-api-link

[#1576] Change api doc url to new one


  Commit: 4e58913add1e2a9472570349d44b2bb848af4932
      https://github.com/ckan/ckan/commit/4e58913add1e2a9472570349d44b2bb848af4932
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M doc/images/manage_users.jpg
    M doc/sysadmin-guide.rst

  Log Message:
  -----------
  [#1602] Fix sysadmin guide adding that the users can be deleted since 2.2

The feature was added in 7c60ba4.


  Commit: 3a134236dd318bb6a47d57df4ea0b7a91ee1540f
      https://github.com/ckan/ckan/commit/3a134236dd318bb6a47d57df4ea0b7a91ee1540f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M doc/sysadmin-guide.rst

  Log Message:
  -----------
  [#1602] The link to manage users is named "Manage", not "Edit"


  Commit: d181a8b8ada50d6f0e1f161f47907b51407d3e47
      https://github.com/ckan/ckan/commit/d181a8b8ada50d6f0e1f161f47907b51407d3e47
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#809] Add i18n guide for devs

Fixes #809


  Commit: 5825ecc27a3d41607e37c97af8b10037b828c816
      https://github.com/ckan/ckan/commit/5825ecc27a3d41607e37c97af8b10037b828c816
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M doc/contributing/index.rst
    A doc/contributing/simple-code-contributions.rst

  Log Message:
  -----------
  [#1564] Add beginner contribution docs on 'Good for Contribution'


  Commit: d397a94c87fd2e583d502ac1b39d3cab7e06c3a5
      https://github.com/ckan/ckan/commit/d397a94c87fd2e583d502ac1b39d3cab7e06c3a5
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  Merge pull request #1628 from ckan/809-string-i18n-docs

[#809] Add i18n guide for devs


  Commit: a1b3b739b62dcae3c7afc12658fdddea98b8df1f
      https://github.com/ckan/ckan/commit/a1b3b739b62dcae3c7afc12658fdddea98b8df1f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M doc/contributing/i18n.rst
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge branch '1573-new-translations-policy'


  Commit: 5f44b70026f218c27f2031410466c416573b1e38
      https://github.com/ckan/ckan/commit/5f44b70026f218c27f2031410466c416573b1e38
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

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


  Commit: b05744b2c1bdc83e182519bc9336476877a60bbc
      https://github.com/ckan/ckan/commit/b05744b2c1bdc83e182519bc9336476877a60bbc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M MANIFEST.in
    M ckan/config/deployment.ini_tmpl
    A ckan/config/resource_formats.json
    M ckan/controllers/user.py
    M ckan/controllers/util.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/helpers.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/macros/form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/snippets/facet_list.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    A doc/contributing/simple-code-contributions.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/images/manage_users.jpg
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst
    M doc/sysadmin-guide.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1505-invite-to-organization-causes-error


Compare: https://github.com/ckan/ckan/compare/43f1c1eff128...b05744b2c1bd

• Previous message: [ckan-changes] [ckan/ckan] a3c5e5: [#1573] Add new translations policy to docs
• Next message: [ckan-changes] [ckan/ckan] 9fadea: [#1350] resource format change
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]