[ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...

• Previous message: [ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...
• Next message: [ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-paster-user-add-uses-action-layer
  Home:   https://github.com/okfn/ckan
  Commit: e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
      https://github.com/okfn/ckan/commit/e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.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
    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/templates/package/read.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  First version of the loading of more items in the activity streams


  Commit: 72d33301c31a06362aaef8bff8bf5815b7595585
      https://github.com/okfn/ckan/commit/72d33301c31a06362aaef8bff8bf5815b7595585
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/activity-stream.js

  Log Message:
  -----------
  Added doc blocks and infinite scrolling on the activity streams


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.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:
  -----------
  Merged master back into branch


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Fix after merge


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py

  Log Message:
  -----------
  Changed param ordering of offset and limit within activity_list functions


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Removed uneeded print


  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: 88d0aafe484bc1d589ab4955cd7883f9e1a3519f
      https://github.com/okfn/ckan/commit/88d0aafe484bc1d589ab4955cd7883f9e1a3519f
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Code cleanup


  Commit: 52cf81fe051ddd6e0819d6221f7d7f3f1444205e
      https://github.com/okfn/ckan/commit/52cf81fe051ddd6e0819d6221f7d7f3f1444205e
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py

  Log Message:
  -----------
  Few code style tweaks


  Commit: a09752ea4351126c39e9d32771ab92282d13f212
      https://github.com/okfn/ckan/commit/a09752ea4351126c39e9d32771ab92282d13f212
  Author: Florian Marienfeld <florian.marienfeld at fokus.fraunhofer.de>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

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

  Log Message:
  -----------
  easy_install --ignore-installed pastescript  fails. corrected into pip install --ignore-installed


  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: 783cf829412fa9d59eec3d64a5e003a46f5e5661
      https://github.com/okfn/ckan/commit/783cf829412fa9d59eec3d64a5e003a46f5e5661
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-03 (Mon, 03 Dec 2012)

  Changed paths:
    A ckan/config/solr/schema-2.0.xml
    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

  Log Message:
  -----------
  [3027] all tests pass for 1.4, 3.6, 4.0, changed mm


  Commit: e5407f47f5d9ace7ac15bc3030f2438d3a8f4803
      https://github.com/okfn/ckan/commit/e5407f47f5d9ace7ac15bc3030f2438d3a8f4803
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [3027] add no solr commit flag


  Commit: c68cdae676248a9c9a1631dd46fc07b88412b9d1
      https://github.com/okfn/ckan/commit/c68cdae676248a9c9a1631dd46fc07b88412b9d1
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  [3027] add dataset_type field


  Commit: bd25e663fcf4ba397fb682b9b48a6d8daa6e08ff
      https://github.com/okfn/ckan/commit/bd25e663fcf4ba397fb682b9b48a6d8daa6e08ff
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M doc/configuration.rst

  Log Message:
  -----------
  [3027] document solr commit option


  Commit: 98345563cc65a928d97f330bc831952d859060bd
      https://github.com/okfn/ckan/commit/98345563cc65a928d97f330bc831952d859060bd
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M ckan/config/solr/CHANGELOG.txt

  Log Message:
  -----------
  [3027] Update schema CHANGELOG


  Commit: 26456b19872f73667bec6b245cb4ced79da03812
      https://github.com/okfn/ckan/commit/26456b19872f73667bec6b245cb4ced79da03812
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    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 'feature-3027-solr-2.0'


  Commit: 5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
      https://github.com/okfn/ckan/commit/5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M README.rst
    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/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/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/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/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_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merged master back into branch


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py

  Log Message:
  -----------
  Fix after merge


  Commit: 2f2368d52fa5623fa256c17bd1b282e52e21c00c
      https://github.com/okfn/ckan/commit/2f2368d52fa5623fa256c17bd1b282e52e21c00c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Revert incorrect doc changes from confusing merge


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

  Changed paths:
    M ckan/lib/base.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py

  Log Message:
  -----------
  pep8 tweak, doc block and comma add. yuk.


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

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Fix for indentation error


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

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Removed uneeded offset that got included from confusing merge


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

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Doc block for new method


  Commit: f67a1c7e8b15929c98531b82f935d35f047cb4ac
      https://github.com/okfn/ckan/commit/f67a1c7e8b15929c98531b82f935d35f047cb4ac
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

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

  Log Message:
  -----------
  Merge pull request #188 from flowma/master

ckan-create-instance broken! use pip install instead of easy_install


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Doc block additions


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

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#3018] Small docstring and param name tweak


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#3018] Clean up some docstrings formatting


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M test-core.ini

  Log Message:
  -----------
  [#3018] Add ckan.activity_list_limit setting

Add `limit` param to activity stream action functions.

Remove default limit and offset values from model/activity.py, handling the
options and defaults has moved into the logic package.

Add ckan.activity_list_limit = 15 to test-core.ini, the failing activity
streams tests pass now.


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3018-activity-streams-load-more


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#3018] Updated template to use new config option

>From feedback from @seanh see: https://github.com/okfn/ckan/pull/171#discussion_r2348697


  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: 1daea396bccb3ca57725aa90267ee72bce0726fd
      https://github.com/okfn/ckan/commit/1daea396bccb3ca57725aa90267ee72bce0726fd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Make recently_changed_packages_activity_stream a helper

recently_changed_packages_activity_stream was an @property of the
HomeController, but it wasn't working, accessing the property just
returned a property object e.g. <property object at 0x7f7210087e68> not
the HTML string as desired.

I think this is because the @property was declared inside a method, and
properties only work at class-level.

The @property cannot simply be moved to class level because it uses
`context`, a param of the index() function it was defined in.

Instead move recently_changed_packages_activity_stream into helpers.py,
where any template (not just the front page) can access it like this:

    {{ h.recently_changed_packages_activity_stream() }}

dashboard_activity_stream is already done the same way (but other
activity streams are not).

This means any existing home/index.html templates that were accessing
recently_changed_packages_activity_stream as an attribute of the
template context itself, will no longer work. However, apparently they
weren't working anyway.


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#3018] Added type cast to config item in template

After feedback from @tobes at https://github.com/okfn/ckan/pull/171#commitcomment-2287166


  Commit: 09059f6198922a1b1175f0811520328c7e93e527
      https://github.com/okfn/ckan/commit/09059f6198922a1b1175f0811520328c7e93e527
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Added ISearchFacets plugin interface


  Commit: 1636f4b8277d1974241f8434ede8cdf8f554a6e6
      https://github.com/okfn/ckan/commit/1636f4b8277d1974241f8434ede8cdf8f554a6e6
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Moved update_facet_titles to IPackageController


  Commit: 798004fb5c449005e82f0c81df30a93a9061c9b0
      https://github.com/okfn/ckan/commit/798004fb5c449005e82f0c81df30a93a9061c9b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Clean whitespace errors


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

  Changed paths:
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch 'master' into 3018-activity-streams-load-more


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

  Changed paths:
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Fix tests


  Commit: 67a6121e8c597a157e6b0064764b0da62f17b488
      https://github.com/okfn/ckan/commit/67a6121e8c597a157e6b0064764b0da62f17b488
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.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
    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 test-core.ini

  Log Message:
  -----------
  Merge branch '3018-activity-streams-load-more'


  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.


Compare: https://github.com/okfn/ckan/compare/558b2be6ea35...e9682e66421f

• Previous message: [ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...
• Next message: [ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]