[ckan-changes] [okfn/ckan] bd3765: fix 500 error on dataset related page plus followe...

Mon Jun 11 10:51:14 UTC 2012

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: bd37658061bd1fac548bd210430cd9548169a562
      https://github.com/okfn/ckan/commit/bd37658061bd1fac548bd210430cd9548169a562
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py

  Log Message:
  -----------
  fix 500 error on dataset related page plus followers count

  Commit: f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
      https://github.com/okfn/ckan/commit/f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  2482 use follower_count logic call

  Commit: 33d44faea38b1514fade9214852762eae69d4d8c
      https://github.com/okfn/ckan/commit/33d44faea38b1514fade9214852762eae69d4d8c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py

  Log Message:
  -----------
  Merge branch '2482-related-items-500-error-followers'

  Commit: 026d332edaa61d4b6a71be865e49652f4c494f4a
      https://github.com/okfn/ckan/commit/026d332edaa61d4b6a71be865e49652f4c494f4a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/model/tag.py

  Log Message:
  -----------
  Fix up docstrings in ckan/model/tag.py

Make them conform to our new docstring standards, so I can use them as
an example.

  Commit: 16848e3166ebff8d8596ab074d7149f37342d6a8
      https://github.com/okfn/ckan/commit/16848e3166ebff8d8596ab074d7149f37342d6a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    R Coding_Standards.rst
    A doc/coding-standards.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2481] Move Coding_Standards.rst into Sphinx docs

  Commit: 2b708ac3d610d771c2d7737db24d8bb599f49b09
      https://github.com/okfn/ckan/commit/2b708ac3d610d771c2d7737db24d8bb599f49b09
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  [#2437] Add commit message guidelines to coding standards

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

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix context dicts in user controller

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

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Make output of multilingual tests less verbose

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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  Make the testing docs clearer

  Commit: 1e8a35a7a3017667587e3bef267d207ef62e0681
      https://github.com/okfn/ckan/commit/1e8a35a7a3017667587e3bef267d207ef62e0681
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2497] when we have a 401 and not logged in keep locale

  Commit: d1238706f31d2e11eb3a462f5219c5378d09f143
      https://github.com/okfn/ckan/commit/d1238706f31d2e11eb3a462f5219c5378d09f143
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Revert "[#2497] when we have a 401 and not logged in keep locale"

not the correct place

This reverts commit 1e8a35a7a3017667587e3bef267d207ef62e0681.

  Commit: cfaf2458c25eaa04b650c9d42961ce8cc07c8935
      https://github.com/okfn/ckan/commit/cfaf2458c25eaa04b650c9d42961ce8cc07c8935
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] use url_for to get correct login url

  Commit: 05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
      https://github.com/okfn/ckan/commit/05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] remove unused imports

  Commit: 288c2fdd980299cdc1f0952154c34c885be08a58
      https://github.com/okfn/ckan/commit/288c2fdd980299cdc1f0952154c34c885be08a58
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] clean whitespace

  Commit: 1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
      https://github.com/okfn/ckan/commit/1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] making logging clearer code

  Commit: 04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
      https://github.com/okfn/ckan/commit/04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] more making logging clearer code

  Commit: 2a8a70879e512d7a1b34d39ce08ace6c145a94d6
      https://github.com/okfn/ckan/commit/2a8a70879e512d7a1b34d39ce08ace6c145a94d6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] improve copde readability

  Commit: 403aaf9d90be07dde89a0d9e64c7bb39009b79c9
      https://github.com/okfn/ckan/commit/403aaf9d90be07dde89a0d9e64c7bb39009b79c9
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  Merge branch '2497-lose-language-on-abort'

  Commit: 8f658b4f59bae684833e5463b9e9b5d988126bb3
      https://github.com/okfn/ckan/commit/8f658b4f59bae684833e5463b9e9b5d988126bb3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  fix logout issue

  Commit: 64bceea1a52bf1f098ffc980a373ef34662a73e7
      https://github.com/okfn/ckan/commit/64bceea1a52bf1f098ffc980a373ef34662a73e7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    R Coding_Standards.rst
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/repoze_patch.py
    M ckan/model/tag.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    A doc/coding-standards.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-2375-demo-theme

Conflicts:
	ckan/controllers/related.py
followers not got - kept from master

  Commit: 38a083e0e2f81914d508ce30ee9145ef0dac7fb6
      https://github.com/okfn/ckan/commit/38a083e0e2f81914d508ce30ee9145ef0dac7fb6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M requires/lucid_conflict.txt

  Log Message:
  -----------
  [#2375] add jinja2 as requirement

  Commit: c3fef7d1fc45b619232b10fc72324ea6267fb095
      https://github.com/okfn/ckan/commit/c3fef7d1fc45b619232b10fc72324ea6267fb095
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/templates/base.html
    R ckan/templates/base.jinja.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    R ckan/templates/footer.jinja.html
    M ckan/templates/group/index.html
    M ckan/templates/group/pages/form_page.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    R ckan/templates/header.jinja.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/pages/form_page.html
    M ckan/templates/package/read.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    R ckan/templates/page.jinja.html
    M ckan/templates/related/pages/form_page.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme

Compare: https://github.com/okfn/ckan/compare/9011a4a...c3fef7d