[ckan-changes] [ckan/ckan] 9793ce: [#2493] Stats extension clean-up

Thu Sep 10 12:11:27 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 9793ce98bbebb62137cd314b3f4c0bd060624263
      https://github.com/ckan/ckan/commit/9793ce98bbebb62137cd314b3f4c0bd060624263
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html

  Log Message:
  -----------
  [#2493] Stats extension clean-up

* removed templates_legacy - no-one uses these. Removed associated
  style.css.
* leaderboard goes with it as there is no jinja equiv and no interest.
  Removed associated controller, demo.html and app.js.

  Commit: 4e6c631dd143abbd061a28977de3136670bc5261
      https://github.com/ckan/ckan/commit/4e6c631dd143abbd061a28977de3136670bc5261
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/pastertemplates/template/README.rst_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    A ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M dev-requirements.txt
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2493-stats

Conflicts:
	ckanext/stats/templates_legacy/ckanext/stats/index.html

  Commit: 4671c9318d99fc775be1329bac608ae05b66c7ab
      https://github.com/ckan/ckan/commit/4671c9318d99fc775be1329bac608ae05b66c7ab
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html

  Log Message:
  -----------
  Merge pull request #2500 from ckan/2493-stats

[#2493] Stats extension clean-up

Compare: https://github.com/ckan/ckan/compare/929f0a2d4499...4671c9318d99