[ckan-changes] [okfn/ckan] cd74cd: [#1401, js][s]: use ckan.site_url in JS when making...

[GitHub]

  Branch: refs/heads/feature-1521-groups-ux
  Home:   https://github.com/okfn/ckan
  Commit: cd74cda24c6219b69c12f2113ed76ba16bad8ddf
      https://github.com/okfn/ckan/commit/cd74cda24c6219b69c12f2113ed76ba16bad8ddf
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1401,js][s]: use ckan.site_url in JS when making API calls.


  Commit: 7088b1fcae685e56a280ec7b396b0f9803a477d9
      https://github.com/okfn/ckan/commit/7088b1fcae685e56a280ec7b396b0f9803a477d9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/_util.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'defect-1401-mount-non-root'

Conflicts:
	ckan/templates/layout_base.html
[merge,from-branch][m]: fixes #1401 - merge 1401 branch thereby closing issue.


  Commit: 64cf29e83129ab631678d1ed435fd48bb2ba5342
      https://github.com/okfn/ckan/commit/64cf29e83129ab631678d1ed435fd48bb2ba5342
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M ckan/templates/group/layout.html
  M ckan/templates/group/read.html

  Log Message:
  -----------
  [#1521][s]: Checking permissions; redirected a link; facetted search is visible.


  Commit: 0e77502f65237a5474a0c4852f913f8f33477d22
      https://github.com/okfn/ckan/commit/0e77502f65237a5474a0c4852f913f8f33477d22
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M ckan/authz.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  A ckan/controllers/storage.py
  M ckan/lib/app_globals.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/helpers.py
  M ckan/lib/search/query.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/authz.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/ckan.ico
  M ckan/public/scripts/application.js
  M ckan/templates/_util.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  A ckan/templates/storage/index.html
  A ckan/templates/storage/success.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/functional/test_storage.py
  A ckan/tests/functional/test_upload.py
  A ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/models/test_repo.py
  M ckan/tests/test_plugins.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/common-error-messages.rst
  M doc/configuration.rst
  A doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/theming.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1521][s]: Merging master in.


  Commit: faa8b2964b37da0a23872cc95f9be133f2a7b6af
      https://github.com/okfn/ckan/commit/faa8b2964b37da0a23872cc95f9be133f2a7b6af
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  [#1521][s]: Tests passing (except those broken on master)


Compare: https://github.com/okfn/ckan/compare/63608ba...faa8b29