[ckan-changes] [ckan/ckan] 64bf27: [#2085] only link to http, https and ftp resource ...

[GitHub]

  Branch: refs/heads/release-v2.2.2
  Home:   https://github.com/ckan/ckan
  Commit: 64bf27da5af923142f8f4ae0d29745604cfccbae
      https://github.com/ckan/ckan/commit/64bf27da5af923142f8f4ae0d29745604cfccbae
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#2085] only link to http, https and ftp resource urls

Conflicts:
	ckan/lib/helpers.py


  Commit: a90b369075f5156694e25e0906bea1d3efd9764e
      https://github.com/ckan/ckan/commit/a90b369075f5156694e25e0906bea1d3efd9764e
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

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

  Log Message:
  -----------
  [#2085] show non-url urls as text in resource_read


  Commit: 62bd292da3c7ed2dda91c045a18221f8866caeec
      https://github.com/ckan/ckan/commit/62bd292da3c7ed2dda91c045a18221f8866caeec
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  [#1936] Avoid private and deleted datasets on stats plugin

The following queries have been udpated:

* Top groups: avoid deleted groups

* Most edited datasets: avoid deleted and private datasets

* Top rated packages: avoid deleted and private datasets (I don't think
  this works anyway)

* Top package owners: don't include deleted or private datasets in the
  counts

Tests updated.


Compare: https://github.com/ckan/ckan/compare/a47992c55944...62bd292da3c7