[ckan-changes] [okfn/ckan] f561cb: Lot's of tweaks to the group, user and package rea...

Thu Dec 13 10:08:15 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: f561cbab8185eb1bcdc720183a1560b4b7699ead
      https://github.com/okfn/ckan/commit/f561cbab8185eb1bcdc720183a1560b4b7699ead
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover-context-user.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    A ckan/templates/snippets/page_header.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html

  Log Message:
  -----------
  Lot's of tweaks to the group, user and package read pages and new snipper for page_header


  Commit: 6daf68c33b4a8e03f7e14291aea603f4974ea76e
      https://github.com/okfn/ckan/commit/6daf68c33b4a8e03f7e14291aea603f4974ea76e
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Wrap inner 2ndary content in block


  Commit: 950036d3cf5a44f4fe19f7ea926d05716cfa8149
      https://github.com/okfn/ckan/commit/950036d3cf5a44f4fe19f7ea926d05716cfa8149
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/popover-context.js
    R ckan/templates/ajax_snippets/popover-context-dataset.html
    R ckan/templates/ajax_snippets/popover-context-group.html
    R ckan/templates/ajax_snippets/popover-context-user.html
    A ckan/templates/ajax_snippets/popover_context_dataset.html
    A ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/ajax_snippets/popover_context_user.html

  Log Message:
  -----------
  Underscores... not dashes


  Commit: 9057a01438fd0eaf708d34808599d4100e123048
      https://github.com/okfn/ckan/commit/9057a01438fd0eaf708d34808599d4100e123048
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3016] Update helpers to allow nicer tab links


  Commit: bfdefdd5510307385b38e30fa9bde5d86e91690c
      https://github.com/okfn/ckan/commit/bfdefdd5510307385b38e30fa9bde5d86e91690c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/templates/snippets/page_header.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#3016] Update templates for new helper


  Commit: 674e01d5dcd104fa23021e709a6d64c1c61f4c0f
      https://github.com/okfn/ckan/commit/674e01d5dcd104fa23021e709a6d64c1c61f4c0f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-13 (Tue, 13 Nov 2012)

  Changed paths:
    M ckan/templates/development/snippets/page_header.html

  Log Message:
  -----------
  [#3016] Fix primer for tabs


  Commit: 9ce1f918a6050dcf7fca29aeb7f8645a1ea2fe1d
      https://github.com/okfn/ckan/commit/9ce1f918a6050dcf7fca29aeb7f8645a1ea2fe1d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Add custom mapper to catch routes


  Commit: 3b8a33e791e6e51884528d4a9f7ea43b4b956de4
      https://github.com/okfn/ckan/commit/3b8a33e791e6e51884528d4a9f7ea43b4b956de4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Fix routes to allow nav links


  Commit: 228d8949e4a7946a9179d5466a5c5122e9501c88
      https://github.com/okfn/ckan/commit/228d8949e4a7946a9179d5466a5c5122e9501c88
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3016] Changes to helper functions for nav links


  Commit: 620e3f37bb9d958d7df662571f569a4653913298
      https://github.com/okfn/ckan/commit/620e3f37bb9d958d7df662571f569a4653913298
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#3016] Fix header nav links to be more readable and sort group_index


  Commit: a36817bb6a98643d157270e19d77b72ff158e717
      https://github.com/okfn/ckan/commit/a36817bb6a98643d157270e19d77b72ff158e717
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#3016] Template user/read_base.html


  Commit: 1c47a941298c36b34cf4bbe19aed24daa0430d78
      https://github.com/okfn/ckan/commit/1c47a941298c36b34cf4bbe19aed24daa0430d78
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3016] Bugfix make sure named routes are available


  Commit: 1d4cde5d1a8f3d29ff49483068ea1fe4d206648b
      https://github.com/okfn/ckan/commit/1d4cde5d1a8f3d29ff49483068ea1fe4d206648b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  [#3016] Changes to package/read_base.py for new tabs


  Commit: e4f6eb814807e4b920d504223cc7faa1ca563741
      https://github.com/okfn/ckan/commit/e4f6eb814807e4b920d504223cc7faa1ca563741
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Formatting of config/routing.py


  Commit: fac6a66b740b6d83732f37a59f6b553b1591c00d
      https://github.com/okfn/ckan/commit/fac6a66b740b6d83732f37a59f6b553b1591c00d
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Tweaked header to work with new better header nav


  Commit: 11081aec34fc9d120ffe4b89b58cb61e96bcca2e
      https://github.com/okfn/ckan/commit/11081aec34fc9d120ffe4b89b58cb61e96bcca2e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/get.py
    A ckan/migration/versions/062_add_dashboard_table.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    A ckan/model/dashboard.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dashboard.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/api/test_activity.py
    A ckan/tests/functional/api/test_dashboard.py
    M ckan_deb/usr/lib/ckan/common.sh
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    M doc/common-error-messages.rst
    A doc/contributing-docs.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    M doc/datastore-setup.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge branch 'master' into 3016-template-tweaks

Conflicts:
	ckan/public/base/less/masthead.less
	ckan/templates/header.html

trivial


  Commit: 9b766b6c5255481fc1d1dbc06aea3dfc8094508b
      https://github.com/okfn/ckan/commit/9b766b6c5255481fc1d1dbc06aea3dfc8094508b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Fix typo


  Commit: 4eadae6adfdb683d0596dc0cd01ddde85a56eb46
      https://github.com/okfn/ckan/commit/4eadae6adfdb683d0596dc0cd01ddde85a56eb46
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/test_user.py
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge branch 'master' into 3016-template-tweaks

Conflicts:
	ckan/config/routing.py

icons added and dashboard url changed


  Commit: cdde06872045466048936529b6d87392257ac283
      https://github.com/okfn/ckan/commit/cdde06872045466048936529b6d87392257ac283
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-01 (Sat, 01 Dec 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 3016-template-tweaks

Conflicts:
	ckan/config/routing.py
	ckan/templates/package/read.html

    dataset follow link added


  Commit: 4c608e6959c12e56975bfb1fe3028c44007ed9f6
      https://github.com/okfn/ckan/commit/4c608e6959c12e56975bfb1fe3028c44007ed9f6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-01 (Sat, 01 Dec 2012)

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

  Log Message:
  -----------
  Fix activity template


  Commit: febea16ef01636b01195994365ecb5cd28bbaa4d
      https://github.com/okfn/ckan/commit/febea16ef01636b01195994365ecb5cd28bbaa4d
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/templates/package/activity.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/page_header.html

  Log Message:
  -----------
  Few small tweaks to templates


  Commit: 9fd3f970241c391fa48a89308806d84cfc41e4d9
      https://github.com/okfn/ckan/commit/9fd3f970241c391fa48a89308806d84cfc41e4d9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#3016] Do not change c.action in related list


  Commit: afbaaf567b256fa37f6affdc79854aad728bc16d
      https://github.com/okfn/ckan/commit/afbaaf567b256fa37f6affdc79854aad728bc16d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/home.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks


  Commit: 02481e0dccd92fc6ef5b27a9241031c19ae28e49
      https://github.com/okfn/ckan/commit/02481e0dccd92fc6ef5b27a9241031c19ae28e49
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3016] Improve doc strings


  Commit: 21613e1c0578bc223a56d2148d23b440c071eb10
      https://github.com/okfn/ckan/commit/21613e1c0578bc223a56d2148d23b440c071eb10
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

  Changed paths:
    M ckan_deb/usr/lib/ckan/common.sh

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks


  Commit: 06f79973ff219daeb5c32a1d927addde95c1ea36
      https://github.com/okfn/ckan/commit/06f79973ff219daeb5c32a1d927addde95c1ea36
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/package/activity_stream.html
    M ckan/tests/functional/test_package.py
    M ckan_deb/usr/lib/ckan/common.sh
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 3016-template-tweaks

Conflicts:
	ckan/config/routing.py

    some extra offset routes added


  Commit: 0e760f9b92c2b8af8d80b9212eb80f25bfa11542
      https://github.com/okfn/ckan/commit/0e760f9b92c2b8af8d80b9212eb80f25bfa11542
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Imporve docstring and comment


  Commit: b21831c3b02e03783b4c6c6d13fa12c60962fc2a
      https://github.com/okfn/ckan/commit/b21831c3b02e03783b4c6c6d13fa12c60962fc2a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/package/activity_stream.html
    M ckan/tests/functional/test_package.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks


  Commit: 9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
      https://github.com/okfn/ckan/commit/9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#3016] Docstring improvement - Sean is the docstring king :)


  Commit: 34abccc9cd3d06d8884548cc9be687d0ca030624
      https://github.com/okfn/ckan/commit/34abccc9cd3d06d8884548cc9be687d0ca030624
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks


  Commit: 3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
      https://github.com/okfn/ckan/commit/3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/templates/base.html
    M ckan/templates/footer.html
    M ckan/templates/header.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks


  Commit: b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
      https://github.com/okfn/ckan/commit/b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/related.py
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/less/masthead.less
    R ckan/templates/ajax_snippets/popover-context-dataset.html
    R ckan/templates/ajax_snippets/popover-context-group.html
    R ckan/templates/ajax_snippets/popover-context-user.html
    A ckan/templates/ajax_snippets/popover_context_dataset.html
    A ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    A ckan/templates/snippets/page_header.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '3016-template-tweaks'


Compare: https://github.com/okfn/ckan/compare/058ace89bfc8...b6dae85e54cc