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

[GitHub]

  Branch: refs/heads/master
  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.


Compare: https://github.com/okfn/ckan/compare/1c27394...7088b1f