[ckan-changes] [ckan/ckan] 0aad65: [#790] Tutorial for custom fields in packages

GitHub noreply at github.com
Wed May 21 11:36:32 UTC 2014 

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 0aad65605435839f115b2651a5119dc7c6ce3b10
      https://github.com/ckan/ckan/commit/0aad65605435839f115b2651a5119dc7c6ce3b10
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] Tutorial for custom fields in packages


  Commit: b5646618e801d2d1a1db25416c71375e84da044a
      https://github.com/ckan/ckan/commit/b5646618e801d2d1a1db25416c71375e84da044a
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/index.rst

  Log Message:
  -----------
  [#790] add custom fields tutorial to extensions index


  Commit: c9038d91ab2e172960868604f3c2bbae5bddc128
      https://github.com/ckan/ckan/commit/c9038d91ab2e172960868604f3c2bbae5bddc128
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] clean up formatting


  Commit: 96233ece26929af181147bd61bd8755f5137577c
      https://github.com/ckan/ckan/commit/96233ece26929af181147bd61bd8755f5137577c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/plugin.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] resource customization tutorial

also added resource example to idataset form example


  Commit: 3a60326db6fb10307e7302fe330186a9a26abed8
      https://github.com/ckan/ckan/commit/3a60326db6fb10307e7302fe330186a9a26abed8
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] add tag-vocabularies to custom-fields tutorial


  Commit: 68cc993368f81347f326c7abeed72c42c45f450d
      https://github.com/ckan/ckan/commit/68cc993368f81347f326c7abeed72c42c45f450d
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] fix titles to match docs style guidelines


  Commit: 92516d1e917b056a4102560d4ad04a502ebd679f
      https://github.com/ckan/ckan/commit/92516d1e917b056a4102560d4ad04a502ebd679f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/plugin_v5.py
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] custom fields tutorial

move source for tutorial into it's own files


  Commit: 1dd533613e9393c74cbe9e87c64142675dee26b1
      https://github.com/ckan/ckan/commit/1dd533613e9393c74cbe9e87c64142675dee26b1
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/new_tests/__init__.py
    A ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst
    M setup.py

  Log Message:
  -----------
  [#790] custom fields tutorial

* Add tests to example_idatasetform plugin.
* Split out source from tutorial into plugins so they can be tested
* Use sphinx referencing
* Add section on validators and conveters
* Minor rewrites, fix titles, etc.


  Commit: 453a18c69caf868d8492390add4a524591d87bcd
      https://github.com/ckan/ckan/commit/453a18c69caf868d8492390add4a524591d87bcd
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#790] undo doc subproject commits


  Commit: d7d7adcd65b6c79d1dfc0fa2bb23befd752e7b8f
      https://github.com/ckan/ckan/commit/d7d7adcd65b6c79d1dfc0fa2bb23befd752e7b8f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    R ckanext/example_idatasetform/plugin_v5.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] remove unused plugin version


  Commit: 33d747091839b4b679b49e165cd80a67976f2e38
      https://github.com/ckan/ckan/commit/33d747091839b4b679b49e165cd80a67976f2e38
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] pep8, fix tests by preventing plugins from loading during import


  Commit: 3fca1af3714af5d204bfadcd82e417bb26412574
      https://github.com/ckan/ckan/commit/3fca1af3714af5d204bfadcd82e417bb26412574
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] IDatasetForm tutorial cleanups


  Commit: ac9ceb194e48270f550d2899f58bc4d8fbf8728a
      https://github.com/ckan/ckan/commit/ac9ceb194e48270f550d2899f58bc4d8fbf8728a
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] IDatasetForm tutorial: add dataset search page sorting


  Commit: 689ab0a05f61a557ee956b03ca016c0e6f6bfa39
      https://github.com/ckan/ckan/commit/689ab0a05f61a557ee956b03ca016c0e6f6bfa39
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/templates/package/search.html

  Log Message:
  -----------
  [#790] Add IDatasetForm search template


  Commit: cb1534b414e691eda8be12cc6c397ea1c4dbcede
      https://github.com/ckan/ckan/commit/cb1534b414e691eda8be12cc6c397ea1c4dbcede
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups


  Commit: ecb70ec152bb4c771dae94b78a8daaa8c819b901
      https://github.com/ckan/ckan/commit/ecb70ec152bb4c771dae94b78a8daaa8c819b901
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups


  Commit: 7d1ac48ffba1bffdca709ad21c127f991d40f7e3
      https://github.com/ckan/ckan/commit/7d1ac48ffba1bffdca709ad21c127f991d40f7e3
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups


  Commit: 931c1b6d0e48dc08e046e93033f3628b27ec4a85
      https://github.com/ckan/ckan/commit/931c1b6d0e48dc08e046e93033f3628b27ec4a85
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    R ckanext/example_idatasetform/new_tests/__init__.py
    R ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] save pylons config prior to tests, restore config in teardown

The plugin implements IConfigurer which adds a directory to the
templates. This clashes with the tests for the multilingual extension
that are running off the legacy templates. Having the
package/search.html template here causes the clash.

Saving and restoring the config means the multilingual tests will not
pickup and templates from this plugin.


  Commit: 2341b712a62ae4896431aab66cd4a51ed13e3f4d
      https://github.com/ckan/ckan/commit/2341b712a62ae4896431aab66cd4a51ed13e3f4d
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] add test for search ordering by custom fields


  Commit: ae11ed32ed63febc489ec39c49ba0d0d006a1d80
      https://github.com/ckan/ckan/commit/ae11ed32ed63febc489ec39c49ba0d0d006a1d80
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M MANIFEST.in
    M README.rst
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.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/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/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/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_create.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_create.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.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/macros/form.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/followee_dropdown.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_user.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/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.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/__init__.py
    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/stats/__init__.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    M 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/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/pull-requests.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
    A doc/contributing/test.rst
    M doc/contributing/testing.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/best-practices.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
    M doc/images/add_dataset_3.jpg
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/images/manage_users.jpg
    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
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 790-idatasetform-tutorial

Conflicts:
	ckan/new_tests/helpers.py


  Commit: 0840aefd4fce39c210e5a92709c577a337fa46cf
      https://github.com/ckan/ckan/commit/0840aefd4fce39c210e5a92709c577a337fa46cf
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] pep8


  Commit: 51f865abc3815f1eef5fd2cebdb10c53e15f3469
      https://github.com/ckan/ckan/commit/51f865abc3815f1eef5fd2cebdb10c53e15f3469
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] make tests python 2.6 compatible


  Commit: 060d5c6eb48067ade66c3dfa551a69b2b2623bd6
      https://github.com/ckan/ckan/commit/060d5c6eb48067ade66c3dfa551a69b2b2623bd6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/templates/footer.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/contributing/pull-requests.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 790-idatasetform-tutorial


  Commit: a95a44db285ec33d2ca3cee05c555c10ab41e82a
      https://github.com/ckan/ckan/commit/a95a44db285ec33d2ca3cee05c555c10ab41e82a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '790-idatasetform-tutorial'


Compare: https://github.com/ckan/ckan/compare/12744924e254...a95a44db285e

More information about the ckan-changes mailing list