[ckan-changes] [ckan/ckan] 220961: Update version number for 2.1.4b

[GitHub]

  Branch: refs/heads/release-v2.1.4
  Home:   https://github.com/ckan/ckan
  Commit: 220961dcf3d3d98f10e83d353f2a71060a7fbb04
      https://github.com/ckan/ckan/commit/220961dcf3d3d98f10e83d353f2a71060a7fbb04
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for 2.1.4b


  Commit: bf474afc773e4571e851355c8a4f99652127a985
      https://github.com/ckan/ckan/commit/bf474afc773e4571e851355c8a4f99652127a985
  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
	ckan/templates/package/snippets/resource_item.html


  Commit: 917545d78c5835dd5600e483dca029906bd3ed80
      https://github.com/ckan/ckan/commit/917545d78c5835dd5600e483dca029906bd3ed80
  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: c37595d6d805ab476374a758769bab0e839293f3
      https://github.com/ckan/ckan/commit/c37595d6d805ab476374a758769bab0e839293f3
  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.

Conflicts:
	ckanext/stats/stats.py


Compare: https://github.com/ckan/ckan/compare/220961dcf3d3^...c37595d6d805