[ckan-changes] [okfn/ckan] : [master][html] Very small change to a python expre...

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: 8dc886122ca8c63e5bb22acdd7a6360cfce9c8c4
      https://github.com/okfn/ckan/commit/8dc886122ca8c63e5bb22acdd7a6360cfce9c8c4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

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

  Log Message:
  -----------
  [master][html] Very small change to a python expression in the html


  Commit: 65da74c93a96ec6ede180f2a203e593b0e438f7a
      https://github.com/okfn/ckan/commit/65da74c93a96ec6ede180f2a203e593b0e438f7a
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  M build.sh
  M ckan/__init__.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  M ckan/lib/cli.py
  M ckan/lib/search/query.py
  M ckan/logic/action/update.py
  M ckan/model/package.py
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/bin/ckan-setup-solr
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/common-error-messages.rst
  M doc/install-from-package.rst
  M doc/loading_data.rst
  M doc/solr-setup.rst
  M doc/test.rst
  R doc/upgrade.rst
  M pip-requirements-test.txt

  Log Message:
  -----------
  [master][merge] from release-v1.5.1c.


  Commit: ae3be840b32f633b6db2b315d24e60f27fa919b5
      https://github.com/okfn/ckan/commit/ae3be840b32f633b6db2b315d24e60f27fa919b5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  M build.sh
  M ckan/__init__.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  M ckan/lib/cli.py
  M ckan/lib/search/query.py
  M ckan/logic/action/update.py
  M ckan/model/package.py
  M ckan/templates/package/layout.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/bin/ckan-setup-solr
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/common-error-messages.rst
  M doc/install-from-package.rst
  M doc/loading_data.rst
  M doc/solr-setup.rst
  M doc/test.rst
  R doc/upgrade.rst
  M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams


  Commit: eb62fb7c42ac04100d9698ec4fb312ab0c4c9d4a
      https://github.com/okfn/ckan/commit/eb62fb7c42ac04100d9698ec4fb312ab0c4c9d4a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/model/__init__.py
  A ckan/templates/activity_streams/new_user.html
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#1625] Add 'new user 'activity stream event.

Add activity_dict_save() function to ckan/lib/dictization/model_save.py.
Initialises an Activity object from a dict and adds the object to the
sqlalchemy session so that it gets saved to the database. Also added a
simple test case to ckan/tests/lib/test_dictization.py.

Add activity_create() function to ckan/logic/action/create.py. This is
the logic function for creating an activity stream event, to be called
by other logic functions. It pretty much just wraps
activity_dict_save(), but creates a new revision for the new activity
and commits the change to the db.

The two functions above will work for any kind of activity stream event.

Extended the user_create() logic function in ckan/logic/action/create.py
to construct an activity dict and call activity_create(), so that a 'new
user' activity stream event is emitted whenever a new user is created.

Added HTML renderer for 'new user' activity to ckan/logic/action/get.py,
and added new_user.html template to ckan/templates/activity_streams.

Added Activity and ActivityDetail classes to ckan/model/__init__.py.


Compare: https://github.com/okfn/ckan/compare/c3627bb...eb62fb7