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

• Previous message: [ckan-changes] [okfn/ckan] f561cb: Lot's of tweaks to the group, user and package rea...
• Next message: [ckan-changes] [okfn/ckan] 90b176: [#3028] Followee dropdown on dashboard is now sear...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/2939-orgs
  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: 4518ddb27b14e94441f182f96925e6b6eed60aba
      https://github.com/okfn/ckan/commit/4518ddb27b14e94441f182f96925e6b6eed60aba
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Process config from config_details


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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  config.favicon default set in config/environment.py so fix and add comment


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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  add extra config options into app_globals


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

  Changed paths:
    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:
  -----------
  Change templates to use g not config for settings


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

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Do not give config to jinja templates


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_dashboard.py
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'master' into clean-config-from-jinja-templates


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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Fix globals names for recaptcha


  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: 60e31d28b0a28c524700d6838356631c6c69e604
      https://github.com/okfn/ckan/commit/60e31d28b0a28c524700d6838356631c6c69e604
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-02 (Sun, 02 Dec 2012)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.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
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/user/dashboard.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/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-config-from-jinja-templates

Conflicts:
	ckan/templates/header.html

    trivial merge

    also lib/app_globals new setting moved to new system


  Commit: 347e81ebd45203b7e5b28b7fe783e4f73b6d7483
      https://github.com/okfn/ckan/commit/347e81ebd45203b7e5b28b7fe783e4f73b6d7483
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-02 (Sun, 02 Dec 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Fix typo in comment


  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: 5fcd88a5ac096d6d651aeab4ec629eb3a2cf42d0
      https://github.com/okfn/ckan/commit/5fcd88a5ac096d6d651aeab4ec629eb3a2cf42d0
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [ec] A very simple tracking stats export.

Paster command to export some very simple tracking stats to a csv file.

(cherry picked from commits 18ca569c3489a170634d2d1dc6ffd5de7c02e338 and
90d1ef68de0d2716a60e5fe730cae650bd43ef69)


  Commit: 558b2be6ea35075f72e20518029543fd232e7233
      https://github.com/okfn/ckan/commit/558b2be6ea35075f72e20518029543fd232e7233
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [ec] Paster command, "user add", uses defers to action layer.

Rather than directly creating the User, which as a consequence will bypass
any custom validation.
(cherry picked from commit e664c459f5d78987d3923ec138a3727b474272ea)


  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: b9178f6d68204af931d52069126b7abc3240bf7c
      https://github.com/okfn/ckan/commit/b9178f6d68204af931d52069126b7abc3240bf7c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  Fixed typo in template. I suspect this never worked.


  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: 624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
      https://github.com/okfn/ckan/commit/624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
  Author: Stefan Wehrmeyer <mail at stefanwehrmeyer.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  [3004][s] Move polib import into paster command method

Moving from module level in order to not require polib
for paster commands.


  Commit: ca58fd6b30af7d71d93563bc4995d6e748855608
      https://github.com/okfn/ckan/commit/ca58fd6b30af7d71d93563bc4995d6e748855608
  Author: John Glover <glover.john at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/lib/base.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 pull request #180 from okfn/clean-config-from-jinja-templates

Clean config from jinja templates


  Commit: 6aa1dc2726a8eb596d55b03897ef74d51c3545ab
      https://github.com/okfn/ckan/commit/6aa1dc2726a8eb596d55b03897ef74d51c3545ab
  Author: John Glover <glover.john at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge pull request #203 from okfn/3004-move-polib-import

[3004][s] Move polib import into paster command method


  Commit: de13b37ae56aa8a70f0e89b913d79f754f86d2fd
      https://github.com/okfn/ckan/commit/de13b37ae56aa8a70f0e89b913d79f754f86d2fd
  Author: John Glover <j at johnglover.net>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.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
    M ckan/templates/base.html
    M ckan/templates/footer.html
    M ckan/templates/header.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    M ckan/tests/functional/test_package.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 ckan_deb/usr/lib/ckan/common.sh
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature-paster-user-add-uses-action-layer


  Commit: e9682e66421feef1edde567a33ec646e9f162d3b
      https://github.com/okfn/ckan/commit/e9682e66421feef1edde567a33ec646e9f162d3b
  Author: John Glover <j at johnglover.net>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#196] Update usage for user command.

User add will fail with new logic layer validation
if email address is not supplised. Updated usage
string to note that email can be supplied via the
command line.


  Commit: 6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
      https://github.com/okfn/ckan/commit/6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
  Author: John Glover <glover.john at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #196 from okfn/feature-paster-user-add-uses-action-layer

[ec] Paster command, "user add", uses defers to action layer.


  Commit: f019ca4d93def31f833265aeabeab875e671d37d
      https://github.com/okfn/ckan/commit/f019ca4d93def31f833265aeabeab875e671d37d
  Author: John Glover <j at johnglover.net>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#195] Small whitespace changes


  Commit: 058ace89bfc8bcf7daa16feffc1cf98400c5a849
      https://github.com/okfn/ckan/commit/058ace89bfc8bcf7daa16feffc1cf98400c5a849
  Author: John Glover <glover.john at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #195 from okfn/feature-improved-tracking-command

[ec] A very simple tracking stats export.


  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'


  Commit: 61c5d2b23dd4684d2fbb3e0596caae554c177c7f
      https://github.com/okfn/ckan/commit/61c5d2b23dd4684d2fbb3e0596caae554c177c7f
  Author: John Martin <me at johnmart.in>
  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/i18n/check_po_files.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/base.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/footer.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/organization/new.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
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    A ckan/templates/snippets/page_header.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#2939] Merged master


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

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#2939] Fix for undefined global within activity stream templates


Compare: https://github.com/okfn/ckan/compare/4c57d8074c49...b70ad3d9e43e

• Previous message: [ckan-changes] [okfn/ckan] f561cb: Lot's of tweaks to the group, user and package rea...
• Next message: [ckan-changes] [okfn/ckan] 90b176: [#3028] Followee dropdown on dashboard is now sear...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]