[ckan-changes] [ckan/ckan] 381a2a: [#2350] Fix validation of license schema.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 381a2a225354126e45cd08c3f168b8d3f35518b0
      https://github.com/ckan/ckan/commit/381a2a225354126e45cd08c3f168b8d3f35518b0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2350] Fix validation of license schema.


  Commit: 1d74ea8ed4034c95578897cf8be430b87e413fa4
      https://github.com/ckan/ckan/commit/1d74ea8ed4034c95578897cf8be430b87e413fa4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  PEP8


  Commit: 1945e89fca109658a22963f02fbc843a8ba2c28c
      https://github.com/ckan/ckan/commit/1945e89fca109658a22963f02fbc843a8ba2c28c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#2350] Add test for editing a user - not directly related to the issue, but useful.


  Commit: aedff1dff634f12500b07260b398cc35b086032c
      https://github.com/ckan/ckan/commit/aedff1dff634f12500b07260b398cc35b086032c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge branch '2350-license-schema' of github.com:ckan/ckan into 2350-license-schema


  Commit: aa5b878ecf1cbba8feca12b8e10cbee9d9a025d6
      https://github.com/ckan/ckan/commit/aa5b878ecf1cbba8feca12b8e10cbee9d9a025d6
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/license.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/models/test_license.py
    M ckan/tests/logic/action/test_get.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2350-license-schema

Conflicts:
	ckan/tests/controllers/test_user.py


  Commit: 2b27a58b9d9a22841f1b6c89657662d19d0dff9d
      https://github.com/ckan/ckan/commit/2b27a58b9d9a22841f1b6c89657662d19d0dff9d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch '2350-license-schema'


Compare: https://github.com/ckan/ckan/compare/8e582080b590...2b27a58b9d9a