[ckan-changes] [okfn/ckan] 7172a9: Merge branch 'master' of https://github.com/okfn/c...

GitHub noreply at github.com
Thu Aug 16 10:06:32 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 7172a9ec277d41c5c73b23e8276decd449e21140
      https://github.com/okfn/ckan/commit/7172a9ec277d41c5c73b23e8276decd449e21140
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/group.py

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


  Commit: ba4faad89725ae33aefb1dfcf71609668ceeacfd
      https://github.com/okfn/ckan/commit/ba4faad89725ae33aefb1dfcf71609668ceeacfd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    M ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html

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


  Commit: fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
      https://github.com/okfn/ckan/commit/fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/__init__.py

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


  Commit: 85097d9e881f9f0dfe1870fe59e681f099b3623d
      https://github.com/okfn/ckan/commit/85097d9e881f9f0dfe1870fe59e681f099b3623d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Some pep8 fixes for lib.helpers


  Commit: 6640521baf54432c247b4cff568ae1bd61f69b20
      https://github.com/okfn/ckan/commit/6640521baf54432c247b4cff568ae1bd61f69b20
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html
    M ckan/templates/related/add-related.html
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

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


  Commit: 388063f2003e275aea6ffa2227478319db80335f
      https://github.com/okfn/ckan/commit/388063f2003e275aea6ffa2227478319db80335f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

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


  Commit: ec53e974a40b4255f844c3f4d773f937c8c98784
      https://github.com/okfn/ckan/commit/ec53e974a40b4255f844c3f4d773f937c8c98784
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/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/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/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/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/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into pep8-lib-helpers

Conflicts:
	ckan/lib/helpers.py

    trivial merge


  Commit: 7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
      https://github.com/okfn/ckan/commit/7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/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/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/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/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/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

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


  Commit: 18f95bfb26c1d71a4bc790224d4bd543a56fa39b
      https://github.com/okfn/ckan/commit/18f95bfb26c1d71a4bc790224d4bd543a56fa39b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'pep8-lib-helpers'


Compare: https://github.com/okfn/ckan/compare/8f7baad5636c...18f95bfb26c1

More information about the ckan-changes mailing list