[ckan-changes] [okfn/ckan] d1c823: Added route 'user/dashboard' and action 'dashboard...

Thu Jun 28 10:15:54 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: d1c82313143b77249223d6da56823c51d1255137
      https://github.com/okfn/ckan/commit/d1c82313143b77249223d6da56823c51d1255137
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  Added route 'user/dashboard' and action 'dashboard' to user controller.


  Commit: b26daa5cc74f9914de317012edd58d1d17283147
      https://github.com/okfn/ckan/commit/b26daa5cc74f9914de317012edd58d1d17283147
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py
    A ckan/templates/user/dashboard.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  New template 'dashboard.html', modified layout


  Commit: 958d00408712c4a3c6b8bd535323ef7c140288de
      https://github.com/okfn/ckan/commit/958d00408712c4a3c6b8bd535323ef7c140288de
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/model/follower.py
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  UserFollowingUser and UserFollowingDataset classes extended to discover followed users and datasets; inlcuded in user controller and template; contains bug: no datasets are displayed


  Commit: 9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
      https://github.com/okfn/ckan/commit/9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  Unified activity stream implemented

unified means activities of the user, of the users being followed by the user and of the datasets being followed by the user


  Commit: 7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
      https://github.com/okfn/ckan/commit/7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/css/style.css
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  Bug fixing, UI refinement


  Commit: 7aef1cd36df8dcd10a093f533dbdd5781cf35261
      https://github.com/okfn/ckan/commit/7aef1cd36df8dcd10a093f533dbdd5781cf35261
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  Click on User tile redirects to dashboard


  Commit: 495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
      https://github.com/okfn/ckan/commit/495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  user/me redirects to dashboard


  Commit: 96383a63a77e73a3f2c12a12c04e16337955fa5f
      https://github.com/okfn/ckan/commit/96383a63a77e73a3f2c12a12c04e16337955fa5f
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  added route /user/read


  Commit: fa81fcab7302e6c6e75f220df592e20f826e8d4f
      https://github.com/okfn/ckan/commit/fa81fcab7302e6c6e75f220df592e20f826e8d4f
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/model/follower.py

  Log Message:
  -----------
  Update comments


  Commit: a341d7675b176b88a753016d7c1491c7a3df4779
      https://github.com/okfn/ckan/commit/a341d7675b176b88a753016d7c1491c7a3df4779
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/environment.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.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/accept.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/schema.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_versions.py
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge commit


  Commit: 03a00570d2b17234b316ac48020690a0467b3371
      https://github.com/okfn/ckan/commit/03a00570d2b17234b316ac48020690a0467b3371
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/follower.py
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Pulled controller functionality into helper function


  Commit: e955ec7b30cd85c77da06c85488522415ffa4f8e
      https://github.com/okfn/ckan/commit/e955ec7b30cd85c77da06c85488522415ffa4f8e
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/model/follower.py

  Log Message:
  -----------
  Merge branch 'feature-2305-dashboard-activity-stream' of https://github.com/kunsv/ckan into feature-2305-dashboard-activity-stream

Conflicts:
	ckan/model/follower.py


  Commit: bbfd131b42bccf9ea976e1802ecf66550f1a5c24
      https://github.com/okfn/ckan/commit/bbfd131b42bccf9ea976e1802ecf66550f1a5c24
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  Some tests added


  Commit: a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
      https://github.com/okfn/ckan/commit/a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

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

  Log Message:
  -----------
  Dashboard now available through API; API tests modified


  Commit: 1c3361322b6be982615ac793db2b2fc1a456585a
      https://github.com/okfn/ckan/commit/1c3361322b6be982615ac793db2b2fc1a456585a
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  brief test for dashboard activtities


  Commit: bad89a82900b154a86606b13d219d81e6893fbe0
      https://github.com/okfn/ckan/commit/bad89a82900b154a86606b13d219d81e6893fbe0
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  user encouragement added


  Commit: 392e9be79d2104d3e71f2305e742c82d39761941
      https://github.com/okfn/ckan/commit/392e9be79d2104d3e71f2305e742c82d39761941
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/test_plugins.py
    M ckanext/organizations/templates/organization_layout.html
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    R requires/lucid_conflict.txt
    R requires/lucid_missing.txt
    R requires/lucid_present.txt

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/okfn/ckan into feature-2305-dashboard-activity-stream


  Commit: 57edefe385abf276c6874e6f7ce30b7621eca122
      https://github.com/okfn/ckan/commit/57edefe385abf276c6874e6f7ce30b7621eca122
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Remove print statements from test_user.py


  Commit: 3cc2f81745260c3569991758452adf32b5fb0289
      https://github.com/okfn/ckan/commit/3cc2f81745260c3569991758452adf32b5fb0289
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2347] Don't add foreign keys to activity model

Don't want to have to do a db migrate for this branch


  Commit: 59b3297bae4461b47037071db26ec80e18eef81a
      https://github.com/okfn/ckan/commit/59b3297bae4461b47037071db26ec80e18eef81a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2347] Remove an unnecessary route, fix link


  Commit: c72c53c28ac32ed64159df263c6acb76238740bd
      https://github.com/okfn/ckan/commit/c72c53c28ac32ed64159df263c6acb76238740bd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#2305] Remove some duplicated css


  Commit: 06ac119c0565001e9a11f9483e2aab6032fa3edf
      https://github.com/okfn/ckan/commit/06ac119c0565001e9a11f9483e2aab6032fa3edf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Add follow feature to CHANGELOG


  Commit: f84b110e38bae47a4cfb05ea062c6d52ed6f144a
      https://github.com/okfn/ckan/commit/f84b110e38bae47a4cfb05ea062c6d52ed6f144a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [#2305] Add follow api to changelog


  Commit: 0d234d78452b47f60677cc2ada342b9852fc5007
      https://github.com/okfn/ckan/commit/0d234d78452b47f60677cc2ada342b9852fc5007
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/follower.py
    M ckan/public/css/style.css
    A ckan/templates/user/dashboard.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Merge branch 'feature-2305-dashboard-activity-stream'


Compare: https://github.com/okfn/ckan/compare/f34883f0c678...0d234d78452b