[ckan-changes] [okfn/ckan] 5b3170: [#1183] Show very simple indicator for job status ...

GitHub noreply at github.com
Mon Oct 28 15:25:34 UTC 2013


  Branch: refs/heads/504-related-update-schema
  Home:   https://github.com/okfn/ckan
  Commit: 5b31702667badc49cc3b963506c3a0208ea24eda
      https://github.com/okfn/ckan/commit/5b31702667badc49cc3b963506c3a0208ea24eda
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Show very simple indicator for job status on resource page


  Commit: d691059da2d71306a266e5ad5dd616a19e8b6b85
      https://github.com/okfn/ckan/commit/d691059da2d71306a266e5ad5dd616a19e8b6b85
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1183] Fix url


  Commit: 64ba2315b3f987215b12880041b7aa4272185424
      https://github.com/okfn/ckan/commit/64ba2315b3f987215b12880041b7aa4272185424
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#938] Fix datapusher test


  Commit: f367fd2ae3f00300895e352f2733b1e91489fc79
      https://github.com/okfn/ckan/commit/f367fd2ae3f00300895e352f2733b1e91489fc79
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    A ckan/templates/snippets/datapusher_status.html

  Log Message:
  -----------
  [#1183] Add snippet for datapusher status indicator


  Commit: afb105999e4b6a49ea1f54bcb122c4278c9648ff
      https://github.com/okfn/ckan/commit/afb105999e4b6a49ea1f54bcb122c4278c9648ff
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#1183] Clean up template code


  Commit: 77060c2ac1d24f13ce67d9ac9ea7294e92985f67
      https://github.com/okfn/ckan/commit/77060c2ac1d24f13ce67d9ac9ea7294e92985f67
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#1183] Only show for users who can edit resource


  Commit: 78a289e119591e3d8c0972f0fab8447855b73f10
      https://github.com/okfn/ckan/commit/78a289e119591e3d8c0972f0fab8447855b73f10
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/templates/snippets/datapusher_status.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Don't use get_action because it will be deprecated in #1193


  Commit: 8c85e3aeee07fa808cae3e0f532809acd804a780
      https://github.com/okfn/ckan/commit/8c85e3aeee07fa808cae3e0f532809acd804a780
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#938] Use datapusher_enabled action instead of checking whether it is enabled ourselves


  Commit: deeb6efb7fec700516a97d5030a1ab0a69b2a8d1
      https://github.com/okfn/ckan/commit/deeb6efb7fec700516a97d5030a1ab0a69b2a8d1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    A ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1183] Add file that I forgot


  Commit: 236a8e927c78597d3e73e16dd0a2eba90d458d81
      https://github.com/okfn/ckan/commit/236a8e927c78597d3e73e16dd0a2eba90d458d81
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    A ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1183] Add file that I forgot


  Commit: 7d0b22b560a4d3b96d7e64d41e375f501acef73b
      https://github.com/okfn/ckan/commit/7d0b22b560a4d3b96d7e64d41e375f501acef73b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/plugin.py
    R ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M setup.py

  Log Message:
  -----------
  [#1196] Move datapusher code into separate extension


  Commit: 2232f3086b0b2c946e1067301bb1623981113fa5
      https://github.com/okfn/ckan/commit/2232f3086b0b2c946e1067301bb1623981113fa5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M ckan/config/middleware.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A 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
    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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A 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
    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/formatters.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/plugins/core.py
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_plugins.py
    M ckanext/reclinepreview/theme/public/resource.config
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 1183-datapusher-status


  Commit: 59ba55959c0194971af47dfddbdc12f44702bbe4
      https://github.com/okfn/ckan/commit/59ba55959c0194971af47dfddbdc12f44702bbe4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M setup.py

  Log Message:
  -----------
  Merge branch '1196-separate-datapusher' into 1200-datastore-read-only


  Commit: 85c50e18c43cccc69446aa977b082de0411a0560
      https://github.com/okfn/ckan/commit/85c50e18c43cccc69446aa977b082de0411a0560
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#938] Validate datapusher_submit with a schema


  Commit: 09bde044490fe73c776064cad2fbb26e41652617
      https://github.com/okfn/ckan/commit/09bde044490fe73c776064cad2fbb26e41652617
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] Imports and comments clean up


  Commit: d8a9f37bab6d1db3401117690200c9bf7476437a
      https://github.com/okfn/ckan/commit/d8a9f37bab6d1db3401117690200c9bf7476437a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#1200] Do not allow writing if url_type != datastore unless force=true is passed


  Commit: 34b4466358dca5f9a6f27dd693cc32e28a3aa644
      https://github.com/okfn/ckan/commit/34b4466358dca5f9a6f27dd693cc32e28a3aa644
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/logic/action.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  [#938] Prepend config option with ckan.


  Commit: 91f6a38ec63f6fe5d31598230eb32a346a39ca9f
      https://github.com/okfn/ckan/commit/91f6a38ec63f6fe5d31598230eb32a346a39ca9f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#1196] Move datapusher tests


  Commit: ef7b3e94c3bc09d60086bbc4ae8b320ad8c61b94
      https://github.com/okfn/ckan/commit/ef7b3e94c3bc09d60086bbc4ae8b320ad8c61b94
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/datapusher_status.html
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Remove datapusher_enabled action and move before_show to datstore. Instead of using the action or the template helper, check whether the plugin is enabled. Moved the action so that changing the url works even if the datapusher is disabled.


  Commit: 7ba58629e003e579d4d0a2ebde16e513d0727758
      https://github.com/okfn/ckan/commit/7ba58629e003e579d4d0a2ebde16e513d0727758
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/tests/functional/test_package.py
    A ckan/tests/models/test_activity.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' into 1200-datastore-read-only

Conflicts:
	ckanext/datastore/tests/test_create.py


  Commit: 4e16bc1abc7578ebcfd564482355f7a5d671a493
      https://github.com/okfn/ckan/commit/4e16bc1abc7578ebcfd564482355f7a5d671a493
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  PEP8


  Commit: 52c93774c83b13cbfa98107cba87aed6ad9d1b13
      https://github.com/okfn/ckan/commit/52c93774c83b13cbfa98107cba87aed6ad9d1b13
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#1224] propogate the NotAuthorized exception extra messages to api


  Commit: 914a43bd4eb029edce2925197b5f46f71e1c2766
      https://github.com/okfn/ckan/commit/914a43bd4eb029edce2925197b5f46f71e1c2766
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  1200 fix merge issues with master, plus plugin fix


  Commit: e079385c05876834fad681261b0e68df6c9b9257
      https://github.com/okfn/ckan/commit/e079385c05876834fad681261b0e68df6c9b9257
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M ckan/model/meta.py
    M ckan/plugins/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [1200] add defaults and make sure datapusher down does not cause errors


  Commit: b8f449e83555ec850a1f0c4fc4bcbb7ded7b3d04
      https://github.com/okfn/ckan/commit/b8f449e83555ec850a1f0c4fc4bcbb7ded7b3d04
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/logic/schema.py
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#1200] make resource data page for reuploading and make error messages better


  Commit: dcf8761053e91f635b1febd6e25e97722272cd38
      https://github.com/okfn/ckan/commit/dcf8761053e91f635b1febd6e25e97722272cd38
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [1200] pep8 and test failure fixups


  Commit: e39f6362e6c682703da7eb65f32ff7e7375e35ef
      https://github.com/okfn/ckan/commit/e39f6362e6c682703da7eb65f32ff7e7375e35ef
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [1200] fix task_staus in context


  Commit: 8f8d2ab1a502100d7da4358ea2947fbf9a5c4adb
      https://github.com/okfn/ckan/commit/8f8d2ab1a502100d7da4358ea2947fbf9a5c4adb
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  1200 make sure all users can submit job


  Commit: 14a3808c013c8654b96a7ee33e4b6c7f5f5a034e
      https://github.com/okfn/ckan/commit/14a3808c013c8654b96a7ee33e4b6c7f5f5a034e
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [#1200] Quick tidy up of the resource_edit based templates


  Commit: 5af301903da9b8642e7c8b775c227f6c39fe0945
      https://github.com/okfn/ckan/commit/5af301903da9b8642e7c8b775c227f6c39fe0945
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  [#1200] Tidies up the resource data view into something a little nicer


  Commit: e8e3c9829641618184922833723a1bdf7969a704
      https://github.com/okfn/ckan/commit/e8e3c9829641618184922833723a1bdf7969a704
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M bin/travis-build
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.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/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.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/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.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/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.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
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_init.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/i18n.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M setup.py
    M test-core.ini

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


  Commit: ad4e7934d686205d760073826feb6925db3c0c5f
      https://github.com/okfn/ckan/commit/ad4e7934d686205d760073826feb6925db3c0c5f
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/model/meta.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1200] fixes from pull request


  Commit: d30986d9f585e5897992ed97146e04672c14d54e
      https://github.com/okfn/ckan/commit/d30986d9f585e5897992ed97146e04672c14d54e
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  Added IOrganizationController to MultilingualGroup

This ensures that organizations are being translated just like groups


  Commit: 904dbf045f47f26692d467edca2ab1a6133e5e60
      https://github.com/okfn/ckan/commit/904dbf045f47f26692d467edca2ab1a6133e5e60
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

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


  Commit: 9359e8d48fba6117caecbd990dafdb9321c68169
      https://github.com/okfn/ckan/commit/9359e8d48fba6117caecbd990dafdb9321c68169
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/templates/package/resource_data.html
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] fix more issues with pull request


  Commit: e09d4c3072a9a74d1ad30afd37da8b057c5eb619
      https://github.com/okfn/ckan/commit/e09d4c3072a9a74d1ad30afd37da8b057c5eb619
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/snippets/resource_help.html

  Log Message:
  -----------
  [#1200] Fix for undefined  on new resource form on non-draft datasets


  Commit: 905e1fe5004fde3e764d9888546591f68cd0f079
      https://github.com/okfn/ckan/commit/905e1fe5004fde3e764d9888546591f68cd0f079
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  [#1224] fix error messages in tests


  Commit: 3be621a30f55aabb414abeadcf31c7b3141ca067
      https://github.com/okfn/ckan/commit/3be621a30f55aabb414abeadcf31c7b3141ca067
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  [#1274] Add tests for organization translation


  Commit: ca51350e25f0350f263bc426c395e5a7686ed759
      https://github.com/okfn/ckan/commit/ca51350e25f0350f263bc426c395e5a7686ed759
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] fix error in getting plugings from config


  Commit: 1fa0e88579ec3b7d5fef9d07cb20c7880ea1dee6
      https://github.com/okfn/ckan/commit/1fa0e88579ec3b7d5fef9d07cb20c7880ea1dee6
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  [#1200] Fix for failing mocha test it's because of scoping...


  Commit: cc4330b0c570aee3508131c99dc51b941236d7be
      https://github.com/okfn/ckan/commit/cc4330b0c570aee3508131c99dc51b941236d7be
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M bin/travis-build
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.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/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.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/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.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/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.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
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_init.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/i18n.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1224-not-auth-except-msg


  Commit: faf01bcdaad186db98abacd9de0769c2abf61448
      https://github.com/okfn/ckan/commit/faf01bcdaad186db98abacd9de0769c2abf61448
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#1224] change tests to check for error type instead of message


  Commit: f18f76bf13468e709fd7af4b763e824f69376292
      https://github.com/okfn/ckan/commit/f18f76bf13468e709fd7af4b763e824f69376292
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] add loaded plugin logic


  Commit: 8cf3fec785710f3c8b54da85f294bd5cf1d74482
      https://github.com/okfn/ckan/commit/8cf3fec785710f3c8b54da85f294bd5cf1d74482
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  Merge branch '1200-datastore-read-only' of github.com:okfn/ckan into 1200-datastore-read-only


  Commit: f67fe417ff88661348efa1d79026437068bc1536
      https://github.com/okfn/ckan/commit/f67fe417ff88661348efa1d79026437068bc1536
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  Merge pull request #1224 from okfn/1224-not-auth-except-msg

propogate NotAuthorized exception message


  Commit: e4fc2fad47f4dfeb749c7de23b550252f855d972
      https://github.com/okfn/ckan/commit/e4fc2fad47f4dfeb749c7de23b550252f855d972
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/snippets/datapusher_status.html
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M doc/configuration.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #1200 from okfn/1200-datastore-read-only

Datapusher Core Extension


  Commit: d52345bb23aca34d74e9d975261284b2f9ee78cd
      https://github.com/okfn/ckan/commit/d52345bb23aca34d74e9d975261284b2f9ee78cd
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Merge pull request #1291 from okfn/1274-multilingual-organizations

Multilingual organizations


  Commit: cd650e892bacd6fd68a466ac2571bc3790b6466a
      https://github.com/okfn/ckan/commit/cd650e892bacd6fd68a466ac2571bc3790b6466a
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/configuration.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 504-related-update-schema


Compare: https://github.com/okfn/ckan/compare/58ccf52ee94c...cd650e892bac


More information about the ckan-changes mailing list