[ckan-changes] [okfn/ckan] 4518dd: Process config from config_details
GitHub
noreply at github.com
Thu Dec 13 10:06:01 UTC 2012
Branch: refs/heads/3016-template-tweaks
Home: https://github.com/okfn/ckan
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: 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: 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: 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: 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: 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
Compare: https://github.com/okfn/ckan/compare/9ef5dab2c2ff...3ee993f61202
More information about the ckan-changes
mailing list