[ckan-changes] [okfn/ckan] b28ae6: Merge branch 'master' of github.com:okfn/ckan into...

GitHub noreply at github.com
Sat Mar 3 21:13:45 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: b28ae660bd5150207c02d63a2253ef4e14de6507
      https://github.com/okfn/ckan/commit/b28ae660bd5150207c02d63a2253ef4e14de6507
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    A .gitmodules
  M .tx/config
  M CHANGELOG.txt
  M README.rst
  A bin/webstore_test.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/revision.py
  M ckan/controllers/user.py
  A ckan/controllers/webstore.py
  M ckan/forms/common.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
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/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/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/lib/activity.py
  M ckan/lib/base.py
  M ckan/lib/captcha.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  A ckan/lib/plugins.py
  M ckan/lib/search/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/__init__.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/plugins/interfaces.py
  A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  A ckan/public/scripts/vendor/html5shiv/html5.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/home/index.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  A ckan/templates/user/logout_first.html
  M ckan/templates/user/read.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/api/test_authorization_group.py
  M ckan/tests/functional/api/test_user.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_search.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_i18n.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckanext/stats/__init__.py
  A ckanext/stats/public/__init__.py
  A ckanext/stats/public/ckanext/__init__.py
  A ckanext/stats/public/ckanext/stats/__init__.py
  A ckanext/stats/templates/__init__.py
  A ckanext/stats/templates/ckanext/__init__.py
  A ckanext/stats/templates/ckanext/stats/__init__.py
  M ckanext/stats/templates/ckanext/stats/index.html
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/test_tag_vocab_plugin.py
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/about.rst
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/conf.py
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/theming.rst
  A doc/webstore.rst
  M doc/writing-extensions.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1807-recently-changed-datasets

Conflicts:
	ckan/controllers/home.py


  Commit: 8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
      https://github.com/okfn/ckan/commit/8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    M ckan/controllers/home.py
  M ckan/logic/action/get.py
  M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'feature-1807-recently-changed-datasets'


Compare: https://github.com/okfn/ckan/compare/e14f90e...8368024

More information about the ckan-changes mailing list