[ckan-changes] [okfn/ckan] 576d07: [stats, #1576][m]: move ckanext-stats into core.

Thu Dec 29 20:20:47 UTC 2011

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan

  Commit: 576d07ffa3bccb7e6a80b1961ac2f961893fae0c
      https://github.com/okfn/ckan/commit/576d07ffa3bccb7e6a80b1961ac2f961893fae0c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M MANIFEST.in
  A ckanext/__init__.py
  A ckanext/stats/__init__.py
  A ckanext/stats/controller.py
  A ckanext/stats/plugin.py
  A ckanext/stats/public/ckanext/stats/app.js
  A ckanext/stats/public/ckanext/stats/demo.html
  A ckanext/stats/public/ckanext/stats/style.css
  A ckanext/stats/stats.py
  A ckanext/stats/templates/ckanext/stats/index.html
  A ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/stats/tests/__init__.py
  A ckanext/stats/tests/test_stats_lib.py
  A ckanext/stats/tests/test_stats_plugin.py
  M setup.py

  Log Message:
  -----------
  [stats,#1576][m]: move ckanext-stats into core.

* Note have not branched off tip of master as kindly has just made changes to backend tables that break this.

  Commit: 91a1c4513ea0ad47943776ccc6bca0eff89f904d
      https://github.com/okfn/ckan/commit/91a1c4513ea0ad47943776ccc6bca0eff89f904d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  [ext-stats,#1576][xs]: rename Package to Dataset and put in subnav bar.

  Commit: f98fbd3c845a8bb879bdd9b9d3b69e78f899bd54
      https://github.com/okfn/ckan/commit/f98fbd3c845a8bb879bdd9b9d3b69e78f899bd54
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckanext/stats/stats.py

  Log Message:
  -----------
  [ext-stats,#1576][xs]: add ckanext.stats.cache_enabled to ckan ini template with doc.

  Commit: 75df022d8eb1fabdbf0263ac511aa827031ed9ed
      https://github.com/okfn/ckan/commit/75df022d8eb1fabdbf0263ac511aa827031ed9ed
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    R ckan/lib/stats.py

  Log Message:
  -----------
  [lib/stats,#1576][s]: remove ckan/lib/stats.py which was moved to ckanext-stats back in June.

* Now back in core at ckanext/stats/stats.py (and has diverged a bit with ckanext/stats/stats.py being newer than ckan/lib/stats.py)
* @davidread moved this to ckanext-stats back in June - see https://github.com/okfn/ckanext-stats/commit/293b2544737d8ab7610884bd5e999ee37f1ab813

  Commit: 86cbc1be7681cbfde4a001bba4fe6fe72b278a38
      https://github.com/okfn/ckan/commit/86cbc1be7681cbfde4a001bba4fe6fe72b278a38
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [ext-stats,#1576][xs]: default enable stats extension and add link to it in footer of theme.

  Commit: 2837fab9f3c1521c9fe0cb16667653e00a486755
      https://github.com/okfn/ckan/commit/2837fab9f3c1521c9fe0cb16667653e00a486755
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [ext-stats,doc,#1576][s]: mark stats as core extension and refactor / improve extensions doc at the same time.

  Commit: ac9688cb6fb0e72b4a06f4935a9fb3214b18ba8e
      https://github.com/okfn/ckan/commit/ac9688cb6fb0e72b4a06f4935a9fb3214b18ba8e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckanext/stats/tests/test_stats_plugin.py
  M test.ini

  Log Message:
  -----------
  [ext-stats,#1576][xs]: very minor test fixes.

* fix up functional test broken by rename in earlier commit 91a1c4513ea0ad47943776ccc6bca0eff89f904d.
* test.ini: add stats to plugins and set ckanext.stats.enable_caching to false as caching does not work in tests.

  Commit: fd95dad7c8e04a26e813a23ef13b803cbba289e5
      https://github.com/okfn/ckan/commit/fd95dad7c8e04a26e813a23ef13b803cbba289e5
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckan/controllers/authorization_group.py
  M ckan/controllers/group_formalchemy.py
  M ckan/forms/common.py
  M ckan/forms/group.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/dumper.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  A ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/templates/package/read.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/misc/test_stats.py
  M ckan/tests/models/test_group.py
  M ckan/tests/test_dumper.py
  M ckanext/stats/stats.py
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1576-stats-ext-into-core

Conflicts:
	ckanext/stats/stats.py
[merge,from-master,#1576][s]: fairly trivial merge from master.

  Commit: cb29d62133bb4d060622f2fa752dd281b71a252b
      https://github.com/okfn/ckan/commit/cb29d62133bb4d060622f2fa752dd281b71a252b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M MANIFEST.in
  M ckan/config/deployment.ini_tmpl
  R ckan/lib/stats.py
  M ckan/templates/layout_base.html
  A ckanext/__init__.py
  A ckanext/stats/__init__.py
  A ckanext/stats/controller.py
  A ckanext/stats/plugin.py
  A ckanext/stats/public/ckanext/stats/app.js
  A ckanext/stats/public/ckanext/stats/demo.html
  A ckanext/stats/public/ckanext/stats/style.css
  A ckanext/stats/stats.py
  A ckanext/stats/templates/ckanext/stats/index.html
  A ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/stats/tests/__init__.py
  A ckanext/stats/tests/test_stats_lib.py
  A ckanext/stats/tests/test_stats_plugin.py
  M doc/extensions.rst
  M setup.py
  M test.ini

  Log Message:
  -----------
  [merge,from-branch,#1576]:(fixes #1576) Merge to master branch feature-1576-stats-ext-into-core.

Compare: https://github.com/okfn/ckan/compare/a8f2124...cb29d62