[ckan-changes] [okfn/ckan] 9318ef: [#523] Initial clean of extensions.rst
GitHub
noreply at github.com
Tue May 7 12:59:57 UTC 2013
Branch: refs/heads/coding-standards-tests
Home: https://github.com/okfn/ckan
Commit: 9318ef4b920e4bd0be5e2d5245ef428642fe017c
https://github.com/okfn/ckan/commit/9318ef4b920e4bd0be5e2d5245ef428642fe017c
Author: tobes <toby.junk at gmail.com>
Date: 2013-03-20 (Wed, 20 Mar 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Initial clean of extensions.rst
Commit: a65f5a6748938a1b1da0f9574054120a2ee1164b
https://github.com/okfn/ckan/commit/a65f5a6748938a1b1da0f9574054120a2ee1164b
Author: tobes <toby.junk at gmail.com>
Date: 2013-03-20 (Wed, 20 Mar 2013)
Changed paths:
M doc/writing-extensions.rst
Log Message:
-----------
[#523] Edit writing-extensions.rst part I
Commit: f8c122723f8de4d986c0b88a2a563f9570212360
https://github.com/okfn/ckan/commit/f8c122723f8de4d986c0b88a2a563f9570212360
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Update configuration flags' documentation
Commit: 5621e48c89a22983fbae95651254cbbb9fba550e
https://github.com/okfn/ckan/commit/5621e48c89a22983fbae95651254cbbb9fba550e
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Reorganize configuration flags' order in the docs
Commit: 7c002297de5a56b77d2fdb9af9fccaa90cca2652
https://github.com/okfn/ckan/commit/7c002297de5a56b77d2fdb9af9fccaa90cca2652
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-03 (Wed, 03 Apr 2013)
Changed paths:
M doc/writing-extensions.rst
Log Message:
-----------
[#523] More writing extensions updates
Commit: 04354826535a2608137ed23255d2a5626ce0d2db
https://github.com/okfn/ckan/commit/04354826535a2608137ed23255d2a5626ce0d2db
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-03 (Wed, 03 Apr 2013)
Changed paths:
M doc/toolkit.rst
M doc/writing-extensions.rst
Log Message:
-----------
[#523] Toolkit update and other fixes
Commit: 86ed2f710756899c49e0bc95f5ff01eca7f9766f
https://github.com/okfn/ckan/commit/86ed2f710756899c49e0bc95f5ff01eca7f9766f
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-03 (Wed, 03 Apr 2013)
Changed paths:
M doc/extensions.rst
R doc/writing-extensions.rst
Log Message:
-----------
[#523] Merge extensions and writing extensions
Commit: 3913148413cd84927f2f11878a43ed143bb5629e
https://github.com/okfn/ckan/commit/3913148413cd84927f2f11878a43ed143bb5629e
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/new_authz.py
Log Message:
-----------
[#786] Allow dataset_show style actions
Commit: 56588ef9550895eac6b6317670e470d5c5e90188
https://github.com/okfn/ckan/commit/56588ef9550895eac6b6317670e470d5c5e90188
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Remove erroneous section on plugin ordering
Commit: 32aa746365e780d6d2dcf3d4387e07ca3f92b058
https://github.com/okfn/ckan/commit/32aa746365e780d6d2dcf3d4387e07ca3f92b058
Author: John Glover <j at johnglover.net>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/data-viewer.rst
Log Message:
-----------
[#531] Update data viewer docs for CKAN 2.0
Commit: 0dfbc87cbd88f22cb194065c85f7b16ab79953cf
https://github.com/okfn/ckan/commit/0dfbc87cbd88f22cb194065c85f7b16ab79953cf
Author: John Glover <j at johnglover.net>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M CONTRIBUTING.rst
M README.rst
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/package_saver.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
R ckan/misc.py
M ckan/model/__init__.py
M ckan/model/license.py
M ckan/model/package.py
M ckan/model/package_relationship.py
M ckan/model/tracking.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/main.css
M ckan/public/base/less/layout.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/prose.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/organization/index.html
M ckan/templates/package/resource_read.html
M ckan/templates/snippets/sort_by.html
M ckan/templates_legacy/package/read_core.html
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/misc/test_format_text.py
M ckan/tests/models/test_package.py
M ckanext/datastore/commands.py
M ckanext/reclinepreview/theme/public/preview_recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M doc/_templates/footer.html
M doc/conf.py
M doc/configuration.rst
A doc/contributing.rst
M doc/database-dumps.rst
A doc/images/popular-dataset.png
A doc/images/popular-resource.png
A doc/images/sort-datasets-by-popularity.png
M doc/index.rst
M doc/install-from-source.rst
M doc/paster.rst
M doc/post-installation.rst
A doc/tracking.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 531-data-viewer-docs
Commit: 33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
https://github.com/okfn/ckan/commit/33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/common-error-messages.rst
M doc/index.rst
M doc/test.rst
Log Message:
-----------
[#535] Move error messages related to test to a separate page.
The idea is to write the common errors that might happen closer to where they're
more common, so you have the information nearby when you need it.
This works well for test errors. For install/upgrade, as we have two methods,
we can't simply add to the same page. I've changed the index so the common
errors page is under the Installation section. Only installation/upgrade
issues should be added there.
Commit: 3c5130e45b690625c9a317d33c74fb2482529a8c
https://github.com/okfn/ckan/commit/3c5130e45b690625c9a317d33c74fb2482529a8c
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/configuration.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/solr-setup.rst
Log Message:
-----------
[#534] Add documentation for some configuration flags
Commit: 3153b2ee3cd755a70274a696d97a124d5242987d
https://github.com/okfn/ckan/commit/3153b2ee3cd755a70274a696d97a124d5242987d
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Remove useless indexes in configuration page
Commit: b515fe7489251ddb5520d79f537d8e9998405e96
https://github.com/okfn/ckan/commit/b515fe7489251ddb5520d79f537d8e9998405e96
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Minor styling adjustements
Commit: b6e4daec4274a4d7dd113d6b5022040db9e04600
https://github.com/okfn/ckan/commit/b6e4daec4274a4d7dd113d6b5022040db9e04600
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
M test-core.ini
Log Message:
-----------
[#534] Remove unused configuration flags
Commit: 95c4aa0e1bfcc8145efb6c5fa0fca990f213346d
https://github.com/okfn/ckan/commit/95c4aa0e1bfcc8145efb6c5fa0fca990f213346d
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Improve docs based on Sean's feedback
Commit: 6ed13083aee4dff19c334b631d1cab97be1e48b4
https://github.com/okfn/ckan/commit/6ed13083aee4dff19c334b631d1cab97be1e48b4
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] More Extension docs reworking
Commit: 3361586875ce9d3ae88d514f40f215ea3a1aa2a2
https://github.com/okfn/ckan/commit/3361586875ce9d3ae88d514f40f215ea3a1aa2a2
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Remove adding plugin interface code.
Commit: f8dd0a16b15203a7cec3fd33a58fbc9f53e29947
https://github.com/okfn/ckan/commit/f8dd0a16b15203a7cec3fd33a58fbc9f53e29947
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Fix sphinx warnings.
Commit: edbf775eb9e0daba831bfc9a7992af360f437190
https://github.com/okfn/ckan/commit/edbf775eb9e0daba831bfc9a7992af360f437190
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Minor fixes.
Commit: 655851a6f66c46d2bc1e7906c33bff4a60baf744
https://github.com/okfn/ckan/commit/655851a6f66c46d2bc1e7906c33bff4a60baf744
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Reflow and better link to toolkit.
Commit: 4f7f911656657c416d5ba6384ec8f8889be1307c
https://github.com/okfn/ckan/commit/4f7f911656657c416d5ba6384ec8f8889be1307c
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] More cleanups.
Commit: f759b78549bc5da52902b3317d43b960def699aa
https://github.com/okfn/ckan/commit/f759b78549bc5da52902b3317d43b960def699aa
Author: amercader <amercadero at gmail.com>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/release-cycle.rst
Log Message:
-----------
[#751] Update release docs
Commit: ab1e9b2980d45ac120be1bf65ba9c11a1cd81f4f
https://github.com/okfn/ckan/commit/ab1e9b2980d45ac120be1bf65ba9c11a1cd81f4f
Author: John Martin <me at johnmart.in>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M doc/theming.rst
Log Message:
-----------
[#520] First swing at the theming docs
Commit: 14b53e72c997e07dd2661ac4b8399626500c238e
https://github.com/okfn/ckan/commit/14b53e72c997e07dd2661ac4b8399626500c238e
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Remove enable plugin section etc.
Commit: 52d925c750af97adaad6c74564320669d7030cf7
https://github.com/okfn/ckan/commit/52d925c750af97adaad6c74564320669d7030cf7
Author: amercader <amercadero at gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M doc/index.rst
M doc/release-cycle.rst
A doc/release-process.rst
Log Message:
-----------
[#751] Move and update release process docs
Updated version from the ones currently on the wiki.
Commit: 6131ec77797580f46bd218e5ca7ab30d83e6d5a8
https://github.com/okfn/ckan/commit/6131ec77797580f46bd218e5ca7ab30d83e6d5a8
Author: John Martin <me at johnmart.in>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#817] Adds untruncated tooltip to facet lists
Commit: 87b3e807ace8bca680ef5c8df79fca1b198b204b
https://github.com/okfn/ckan/commit/87b3e807ace8bca680ef5c8df79fca1b198b204b
Author: John Martin <me at johnmart.in>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#817] Only shows title if it's truncated
Commit: 0c8fd56dee75560678e2fecf8cf75ee012340264
https://github.com/okfn/ckan/commit/0c8fd56dee75560678e2fecf8cf75ee012340264
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
Merge branch '817-facet-tooltips'
Commit: 8cbdd3139f34b5fe9d7e33a952650f043d1f5eaa
https://github.com/okfn/ckan/commit/8cbdd3139f34b5fe9d7e33a952650f043d1f5eaa
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#819] Fix code error on abort in user controller
Commit: 4ed9265512418aa6298fbddeebdb3d855f1c3b9b
https://github.com/okfn/ckan/commit/4ed9265512418aa6298fbddeebdb3d855f1c3b9b
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/new_authz.py
Log Message:
-----------
Merge pull request #786 from okfn/786-update-action-names
update actions to use correct names
Commit: 167be530eb0ed5b9d99fc1bb6a3a035877c203f7
https://github.com/okfn/ckan/commit/167be530eb0ed5b9d99fc1bb6a3a035877c203f7
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M bin/travis-build
Log Message:
-----------
[#799] Travis remove sed crap
Instead of hacking on development.ini, we simply use the defaults in test-core.ini.
Commit: 48be10548e68ae60db5e583c8219cbfba27b16d8
https://github.com/okfn/ckan/commit/48be10548e68ae60db5e583c8219cbfba27b16d8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
M doc/multilingual.rst
Log Message:
-----------
[#523] Fix formatting in extensions list in docs
Commit: c6a6366676358f4c7a2e323c63a0704221730704
https://github.com/okfn/ckan/commit/c6a6366676358f4c7a2e323c63a0704221730704
Author: John Martin <me at johnmart.in>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M ckan/public/base/images/flags.png
Log Message:
-----------
[#824] Adds correct flags for sweden, slovakia and slovenia
Commit: 0746d2d40599df0f37f6947e7f0416c416e5e6da
https://github.com/okfn/ckan/commit/0746d2d40599df0f37f6947e7f0416c416e5e6da
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Some more updates add example etc
Commit: 554dc917f55f583118d67d0650064a07b4b773fe
https://github.com/okfn/ckan/commit/554dc917f55f583118d67d0650064a07b4b773fe
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
M doc/multilingual.rst
Log Message:
-----------
Merge branch '523-docs-extensions' of github.com:okfn/ckan into 523-docs-extensions
Commit: 98ad884259f60a84c21b4161c9e5daa8420873e8
https://github.com/okfn/ckan/commit/98ad884259f60a84c21b4161c9e5daa8420873e8
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Add example
Commit: d1555e8d3fa77757f1b1f06b9676bf0bce79e649
https://github.com/okfn/ckan/commit/d1555e8d3fa77757f1b1f06b9676bf0bce79e649
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Fix formatting
Commit: e1a54d706ae9ba7c46789ad41cdc686dd21d26c7
https://github.com/okfn/ckan/commit/e1a54d706ae9ba7c46789ad41cdc686dd21d26c7
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] More improvements
Commit: 13d4caea7d2edf8c9e809c2a370c03954dca850e
https://github.com/okfn/ckan/commit/13d4caea7d2edf8c9e809c2a370c03954dca850e
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/tests/test_search.py
Log Message:
-----------
[#825] Replace % with %% to escape it in sql statements
Commit: 887aad0b559e58dcb149112fc486a060790de8ec
https://github.com/okfn/ckan/commit/887aad0b559e58dcb149112fc486a060790de8ec
Author: John Martin <me at johnmart.in>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M ckan/templates/dataviewer/snippets/data_preview.html
Log Message:
-----------
[#827] Adds to button for full ga integration
Commit: 62a39b86b42964a2e89165ab564ff5cb55b7a995
https://github.com/okfn/ckan/commit/62a39b86b42964a2e89165ab564ff5cb55b7a995
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/configuration.rst
M doc/i18n.rst
Log Message:
-----------
[#534] Document some undocumented config options
The added options are:
ckan.tracking_enabled
search.facet.limits
ckan.root_path
ckan.site_intro_text
Commit: 92352062968b9866338a1cf14a85b9af74d492a5
https://github.com/okfn/ckan/commit/92352062968b9866338a1cf14a85b9af74d492a5
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M CONTRIBUTING.rst
M README.rst
M bin/osx-postgres-mem.sh
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/package_saver.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/067_turn_extras_to_strings.py
R ckan/misc.py
M ckan/model/__init__.py
M ckan/model/license.py
M ckan/model/package.py
M ckan/model/package_relationship.py
M ckan/model/tag.py
M ckan/model/tracking.py
M ckan/new_authz.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/main.css
M ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/prose.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/actions.html
A ckan/templates/development/snippets/context.html
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/media_grid.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/page_header.html
R ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/admins.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
A ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/read.html
A ckan/templates/group/snippets/history_revisions.html
A ckan/templates/group/snippets/revisions_table.html
M ckan/templates/header.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/new.html
M ckan/templates/organization/read.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
A ckan/templates/package/history.html
M ckan/templates/package/read.html
M 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/package/snippets/additional_info.html
M ckan/templates/package/snippets/data_api_button.html
A ckan/templates/package/snippets/history_revisions.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
A ckan/templates/package/snippets/revisions_table.html
M ckan/templates/package/snippets/search_form.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/dashboard.html
A ckan/templates/revision/__init__.py
A ckan/templates/revision/diff.html
A ckan/templates/revision/list.html
A ckan/templates/revision/read.html
A ckan/templates/revision/read_base.html
A ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/sort_by.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout.html
M ckan/templates/user/new.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read.html
M ckan/templates_legacy/package/read_core.html
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_init.py
M ckan/tests/logic/test_member.py
M ckan/tests/misc/test_format_text.py
M ckan/tests/models/test_package.py
M ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
M ckanext/datastore/db.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_search.py
A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
M ckanext/reclinepreview/theme/public/preview_recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M doc/_templates/footer.html
R doc/about.rst
M doc/authorization.rst
R doc/commenting.rst
M doc/conf.py
M doc/configuration.rst
R doc/contrib.rst
A doc/contributing.rst
M doc/css-coding-standards.rst
M doc/database-dumps.rst
M doc/frontend-development.rst
A doc/images/popular-dataset.png
A doc/images/popular-resource.png
A doc/images/sort-datasets-by-popularity.png
A doc/importing-datasets.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/javascript-coding-standards.rst
M doc/javascript-module-tutorial.rst
M doc/legacy-api.rst
R doc/loading-data.rst
R doc/organizations_and_groups.rst
M doc/paster.rst
M doc/post-installation.rst
R doc/publisher-profile.rst
M doc/publishing-datasets.rst
M doc/resources.rst
M doc/templating.rst
M doc/test.rst
A doc/tracking.rst
R doc/user-stories-list.rst
R doc/user-stories.rst
M test-core.ini
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into 534
Conflicts:
doc/configuration.rst
Commit: a4bffcb23473a6cb88a39af3b5229e8e86c2372c
https://github.com/okfn/ckan/commit/a4bffcb23473a6cb88a39af3b5229e8e86c2372c
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M doc/configuration.rst
M doc/email-notifications.rst
M doc/tracking.rst
Log Message:
-----------
[#534] Add E-mail Settings section and add cross-references to the config options.
Commit: a91434a9477459c251681bdad4b98c6560fb37d3
https://github.com/okfn/ckan/commit/a91434a9477459c251681bdad4b98c6560fb37d3
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/tests/test_search.py
Log Message:
-----------
Merge branch '825-percent-in-sql'
Commit: ae3ea3bcfdfbc7900c8bc0b82a993c572e9a1942
https://github.com/okfn/ckan/commit/ae3ea3bcfdfbc7900c8bc0b82a993c572e9a1942
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/i18n.rst
M doc/solr-setup.rst
M doc/tracking.rst
M test-core.ini
Log Message:
-----------
Merge branch '534' of git://github.com/vitorbaptista/ckan into vitorbaptista-534
Commit: 624ec6fb38d259a729f4697244edc23344a3dfa0
https://github.com/okfn/ckan/commit/624ec6fb38d259a729f4697244edc23344a3dfa0
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/i18n.rst
M doc/solr-setup.rst
M doc/tracking.rst
M test-core.ini
Log Message:
-----------
Merge branch 'vitorbaptista-534' into 534-update-config-options-docs
Commit: 66859bf98518a5538e72a684e26a43b9b1ef111d
https://github.com/okfn/ckan/commit/66859bf98518a5538e72a684e26a43b9b1ef111d
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Remove legacy config options
These ones are no longer used and will just confuse:
* package_form
* carrot_messaging_library
* amqp_hostname & amqp_port & amqp_user_id & amqp_password
* ckan.log_dir
* ckan.dump_dir
* ckan.backup_dir
Also some minor formatting fixes.
Commit: 9c05c6fbeac0273aafe0c99021a8fbd70201eba9
https://github.com/okfn/ckan/commit/9c05c6fbeac0273aafe0c99021a8fbd70201eba9
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Rearrange sections and items
Sections rearranged by importance/usage and items put to their relevant
one.
Sections are now:
*General Settings
* Database Settings
* Site Settings
* Search Settings
* Plugin Settings
* Front-End Settings
* Theming Settings
* Activity Streams Settings
* Feeds Settings
* Internationalisation Settings
* Storage Settings
* Form Settings
* E-mail Settings
Commit: 01cd2def9e2be7ffd0afb6de8c96c654b7572a7c
https://github.com/okfn/ckan/commit/01cd2def9e2be7ffd0afb6de8c96c654b7572a7c
Author: amercader <amercadero at gmail.com>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M doc/authorization.rst
M doc/configuration.rst
Log Message:
-----------
[#534] Move authorization setting to config options docs
They are one of the most important ones and they should be found on the
conguration options docs. To avoid duplicating them the include rst
directive is used:
.. include:: /configuration.rst
:start-after: start_config-authorization
:end-before: end_config-authorization
This requires setting the two markers on the imported file, eg:
.. start_config-authorization
... stuff to include ...
.. end_config-authorization
Commit: bd2669b770d54e64b08d7bf5a109b8ed5a56f84f
https://github.com/okfn/ckan/commit/bd2669b770d54e64b08d7bf5a109b8ed5a56f84f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/apps-ideas.rst
M doc/configuration.rst
M doc/email-notifications.rst
M doc/i18n.rst
M doc/solr-setup.rst
M doc/tracking.rst
Log Message:
-----------
[#534] Make reST labels for config settings consistent
Make the reST label for cross-referencing each config setting the same
as the name of the config setitng itself, e.g.
ckan.activity_streams_email_notifications, don't mix and match different
styles of ., _ and - like ckan-activity-streams-email-notifications,
ckan_activity_streams_email_notifications, etc.
Commit: 205ae65354b57bf0c592f87ee8fde3b6b67491c0
https://github.com/okfn/ckan/commit/205ae65354b57bf0c592f87ee8fde3b6b67491c0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/configuration.rst
M doc/form-integration.rst
Log Message:
-----------
[#534] Add reST labels to all config options
Now we can easily cross-reference any config option from any file in
docs/.
Commit: d808cbe8168b4f8a26cdff01671d21eadaade848
https://github.com/okfn/ckan/commit/d808cbe8168b4f8a26cdff01671d21eadaade848
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Edit top of configuration docs page
Use the default ini file locations; Clarify what the [app:main] section
is; say "restart webserver" not Apache, webserver may not be Apache.
Commit: fbf3141f5159824a398a190eaadad0f00fd7999d
https://github.com/okfn/ckan/commit/fbf3141f5159824a398a190eaadad0f00fd7999d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Use .. deprecated:: in config docs
Commit: 2b8644c71f85d44ae371ed991881eb0ca8f4addb
https://github.com/okfn/ckan/commit/2b8644c71f85d44ae371ed991881eb0ca8f4addb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/release-cycle.rst
Log Message:
-----------
[#751] Edit the release cycle docs
Commit: f89509767ce91d65a75e4d413ccc59adbe61707a
https://github.com/okfn/ckan/commit/f89509767ce91d65a75e4d413ccc59adbe61707a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M doc/index.rst
M doc/release-cycle.rst
A doc/release-process.rst
Log Message:
-----------
Merge branch '751-release-docs'
Commit: f6fb1b71a0c56a7c1202f5afdbdd98b539b8489a
https://github.com/okfn/ckan/commit/f6fb1b71a0c56a7c1202f5afdbdd98b539b8489a
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-04-28 (Sun, 28 Apr 2013)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
[#838] Postgres error codes are five character strings, not integers
Commit: 4fd47cc25314c4fd58ac85c9331b68cd59a9f0b9
https://github.com/okfn/ckan/commit/4fd47cc25314c4fd58ac85c9331b68cd59a9f0b9
Author: amercader <amercadero at gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch '838-pgcode-string'
Commit: 5eeb2b196f8cc3be531fd3aaa4f7f4f291007025
https://github.com/okfn/ckan/commit/5eeb2b196f8cc3be531fd3aaa4f7f4f291007025
Author: amercader <amercadero at gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ckan/templates/dataviewer/snippets/data_preview.html
Log Message:
-----------
Merge branch '827-ga-fix'
Commit: 81316507367970ad814eaa1b53f7daf6c65c4c6d
https://github.com/okfn/ckan/commit/81316507367970ad814eaa1b53f7daf6c65c4c6d
Author: John Glover <j at johnglover.net>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
M doc/data-viewer.rst
Log Message:
-----------
[#531] Update data viewer docs
Commit: 8d4cbb951a542599274069f1b4b57ce1137dacf5
https://github.com/okfn/ckan/commit/8d4cbb951a542599274069f1b4b57ce1137dacf5
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ckan/public/base/images/flags.png
Log Message:
-----------
Merge branch '824-flags'
Commit: 4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
https://github.com/okfn/ckan/commit/4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ckan/lib/base.py
M ckan/lib/render.py
Log Message:
-----------
[#808] Fix unicode template 500 error
Commit: 07ecbaa86dea992b320e9e5380b671e99b65b25d
https://github.com/okfn/ckan/commit/07ecbaa86dea992b320e9e5380b671e99b65b25d
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/common-error-messages.rst
Log Message:
-----------
[#535] Remove errors that aren't valid anymore
Commit: 2ebe3446258cac50d345468afa2f29c037bb4fba
https://github.com/okfn/ckan/commit/2ebe3446258cac50d345468afa2f29c037bb4fba
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Document ckan.template_title_deliminater
Commit: f23f50c656ed00f7035b8a13d4193dadb8521cfc
https://github.com/okfn/ckan/commit/f23f50c656ed00f7035b8a13d4193dadb8521cfc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Calm down over-the-top warning
Commit: a06d66bf77d5b64b9f86e09e1fea9a9d8136deee
https://github.com/okfn/ckan/commit/a06d66bf77d5b64b9f86e09e1fea9a9d8136deee
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Fix some formatting issues in the docs
Commit: 3eacba4653f7e755049ea62d17ffaede195d729a
https://github.com/okfn/ckan/commit/3eacba4653f7e755049ea62d17ffaede195d729a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Docs correction: template_footer_end is not legacy
Appears in jinja templates
Commit: 9e4f89efdcdb4f1942c1d17f69ba68cc3df9aaaf
https://github.com/okfn/ckan/commit/9e4f89efdcdb4f1942c1d17f69ba68cc3df9aaaf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Update ckan.site_url docs
This is used by much more than just the API
Commit: 2e460d761f1cf73c7b5ee7e14bef5352a679329b
https://github.com/okfn/ckan/commit/2e460d761f1cf73c7b5ee7e14bef5352a679329b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Typo
Commit: 00148981bbe0b938862e18fadc268a6923c0c4d1
https://github.com/okfn/ckan/commit/00148981bbe0b938862e18fadc268a6923c0c4d1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Docs: correct default value fopr ckan.cache_expires
Commit: a88825ba6d682c96c6e99ce42d6bb8f09c50214d
https://github.com/okfn/ckan/commit/a88825ba6d682c96c6e99ce42d6bb8f09c50214d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Correct ckan.page_cache_enabled
Fix typos, and mark the feature as experimental
Commit: 2da8ff29abcbd8e6a5b521767d3ff56c13e240e4
https://github.com/okfn/ckan/commit/2da8ff29abcbd8e6a5b521767d3ff56c13e240e4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Typo
Commit: 2065b3d7ef2d402d80315b8d14061cea56094f94
https://github.com/okfn/ckan/commit/2065b3d7ef2d402d80315b8d14061cea56094f94
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Fix ckan.plugins docs
It's a list of plugins, not a list of extensions
Commit: 31a0c22a460a45593fb45868d8026de986889756
https://github.com/okfn/ckan/commit/31a0c22a460a45593fb45868d8026de986889756
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#534] Fix a couple of formatting issues in docs
Commit: fabee46f9029e4feb6ff21c5391565b634ee60e5
https://github.com/okfn/ckan/commit/fabee46f9029e4feb6ff21c5391565b634ee60e5
Author: John Glover <j at johnglover.net>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M doc/data-viewer.rst
Log Message:
-----------
[#531] Add note about /preview URL for resources.
Commit: 11225e167f3c9ed9d4a0074116a48cdca111b43b
https://github.com/okfn/ckan/commit/11225e167f3c9ed9d4a0074116a48cdca111b43b
Author: John Martin <me at johnmart.in>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/theming.rst
Log Message:
-----------
[#520] Minor textual tweaks
Commit: fb0ccd16fb9a9b9ea2b505762be7f75b4e426b94
https://github.com/okfn/ckan/commit/fb0ccd16fb9a9b9ea2b505762be7f75b4e426b94
Author: John Martin <me at johnmart.in>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#520] Jinja2 not Jinja
Commit: eeeb2ba1b97157961e68060ea551545623ad05b1
https://github.com/okfn/ckan/commit/eeeb2ba1b97157961e68060ea551545623ad05b1
Author: tobes <toby.junk at gmail.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
R doc/geospatial.rst
R doc/harvesting.rst
Log Message:
-----------
[#523] Remove geospatial and harvester docs form core
Commit: f8e1c67d8577eb02c58f8456640426899c75c456
https://github.com/okfn/ckan/commit/f8e1c67d8577eb02c58f8456640426899c75c456
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Fix some titles in the extensions docs
Commit: 19361f8fe73c7ea2cd94d64be6c46f0879e5d8fd
https://github.com/okfn/ckan/commit/19361f8fe73c7ea2cd94d64be6c46f0879e5d8fd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/extensions.rst
A doc/overview.rst
M doc/toolkit.rst
A doc/writing-documentation.rst
Log Message:
-----------
[#523] Edit the extensions docs
Just a couple of small edits
Commit: b5bee6e145d586fe29c3cb4dde554ea27c59b1b3
https://github.com/okfn/ckan/commit/b5bee6e145d586fe29c3cb4dde554ea27c59b1b3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/apps-ideas.rst
M doc/authorization.rst
M doc/configuration.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/form-integration.rst
M doc/i18n.rst
M doc/tracking.rst
M test-core.ini
Log Message:
-----------
Merge branch '534-update-config-options-docs'
Commit: ad809c80df9afecf68bcdeaa7780942219e19988
https://github.com/okfn/ckan/commit/ad809c80df9afecf68bcdeaa7780942219e19988
Author: John Martin <me at johnmart.in>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
R doc/extension-templating.rst
M doc/templating.rst
Log Message:
-----------
[#520] Removes doc/extenstion-templating.html as it's inaccurate and wrong
Commit: 66f4adae58274b1edbfbfd58562c9c639669419b
https://github.com/okfn/ckan/commit/66f4adae58274b1edbfbfd58562c9c639669419b
Author: John Martin <me at johnmart.in>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/theming.rst
Log Message:
-----------
[#520] Few more textual tweaks
Commit: 3ee60a58304dae7c33cc757ed9a6a0bbadf7355e
https://github.com/okfn/ckan/commit/3ee60a58304dae7c33cc757ed9a6a0bbadf7355e
Author: John Martin <me at johnmart.in>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M doc/templating.rst
M doc/theming.rst
Log Message:
-----------
[#520] Added more context to how to add templates within an extension
Commit: 2afe4269097e21c46547cec68ad80f7a293c5a1a
https://github.com/okfn/ckan/commit/2afe4269097e21c46547cec68ad80f7a293c5a1a
Author: amercader <amercadero at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/logic/action/get.py
Log Message:
-----------
[#853] Fix license facets
The current default facets were using a 'license' field which is not present
in the Solr index. Changed it to 'license_id' and added some logic in
package_search to return a display name for them.
Commit: f6e2750e86305742d68d55890e2114bccda2c461
https://github.com/okfn/ckan/commit/f6e2750e86305742d68d55890e2114bccda2c461
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/new_authz.py
M ckan/public/base/css/main.css
M ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/actions.html
A ckan/templates/development/snippets/context.html
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/media_grid.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/page_header.html
R ckan/templates/development/snippets/toolbar.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/snippets/facet_list.html
A ckan/tests/logic/test_init.py
M ckan/tests/logic/test_member.py
M ckanext/datastore/db.py
M ckanext/datastore/tests/test_search.py
M doc/apps-ideas.rst
M doc/authorization.rst
R doc/commenting.rst
M doc/configuration.rst
M doc/css-coding-standards.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/form-integration.rst
M doc/frontend-development.rst
M doc/i18n.rst
A doc/importing-datasets.rst
M doc/index.rst
M doc/javascript-coding-standards.rst
M doc/javascript-module-tutorial.rst
R doc/loading-data.rst
R doc/organizations_and_groups.rst
R doc/publisher-profile.rst
M doc/publishing-datasets.rst
M doc/release-cycle.rst
A doc/release-process.rst
M doc/resources.rst
M doc/templating.rst
M doc/tracking.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 531-data-viewer-docs
Conflicts:
doc/configuration.rst
Commit: f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
https://github.com/okfn/ckan/commit/f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M doc/data-viewer.rst
Log Message:
-----------
[#531] Fix references after merge
Commit: 30c5ff751dec5435eea00d8ee736ae3c2893f5f0
https://github.com/okfn/ckan/commit/30c5ff751dec5435eea00d8ee736ae3c2893f5f0
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M doc/data-viewer.rst
Log Message:
-----------
Merge pull request #531 from okfn/531-data-viewer-docs
Update Data Viewer docs for 2.0
Commit: 2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
https://github.com/okfn/ckan/commit/2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '853-license-facet'
Commit: e4055530a835770de6f8db20ca9bc2d82f9e1d60
https://github.com/okfn/ckan/commit/e4055530a835770de6f8db20ca9bc2d82f9e1d60
Author: John Martin <me at johnmart.in>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
R ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
Log Message:
-----------
[#822] Removes flags from language dropdown in footer
Commit: f18bf06cb36ac0d687794779c877daf283f72599
https://github.com/okfn/ckan/commit/f18bf06cb36ac0d687794779c877daf283f72599
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#859] Fix default sort ordering
The default sort ordering for dataset searches is supposed to be
most-recently-modified first, but it's actually most-recently-created
first. This appears to have been a typo/accidental change in this
commit: bc496ff. Change it back to most-recently-modified.
Commit: 811b5467a81d07d4db12e1d200539121f90b8f63
https://github.com/okfn/ckan/commit/811b5467a81d07d4db12e1d200539121f90b8f63
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
R doc/overview.rst
R doc/writing-documentation.rst
Log Message:
-----------
[#523] Remove a couple of accidentally-completed files
A couple of draft docs files got committed by accident, remove them.
Commit: 2ef6f37303a5d5d227d38a8385cc9bc2094ae681
https://github.com/okfn/ckan/commit/2ef6f37303a5d5d227d38a8385cc9bc2094ae681
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M doc/architecture.rst
M doc/background-tasks.rst
M doc/extensions.rst
M doc/index.rst
M doc/tag-vocabularies.rst
Log Message:
-----------
[#523] sphinx fixes
Commit: 8fe645977f2c34f8fac81ee3c241eb3968e09625
https://github.com/okfn/ckan/commit/8fe645977f2c34f8fac81ee3c241eb3968e09625
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
R doc/overview.rst
R doc/writing-documentation.rst
Log Message:
-----------
Merge branch '523-docs-extensions' of github.com:okfn/ckan into 523-docs-extensions
Commit: 915d2982d5fd864dc01e217652252b0b5a7fd400
https://github.com/okfn/ckan/commit/915d2982d5fd864dc01e217652252b0b5a7fd400
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#830] Dashboard filter fix
Commit: c6132e24b7c54eacfbdb9d45eae7a9c9bff09a3c
https://github.com/okfn/ckan/commit/c6132e24b7c54eacfbdb9d45eae7a9c9bff09a3c
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Recompile css
Commit: 0e789022bab14772e044260d6d291c6570f5fd7d
https://github.com/okfn/ckan/commit/0e789022bab14772e044260d6d291c6570f5fd7d
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '859-fix-default-sort-ordering'
Commit: c1018fd696af7cc5598d4d4c87103c36e0c0277e
https://github.com/okfn/ckan/commit/c1018fd696af7cc5598d4d4c87103c36e0c0277e
Author: John Martin <me at johnmart.in>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#520] Added blank line for better code rendering
Commit: 7d0723e24e837efd4d5b5679a50bdf5998b3c525
https://github.com/okfn/ckan/commit/7d0723e24e837efd4d5b5679a50bdf5998b3c525
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
R doc/extension-templating.rst
M doc/templating.rst
M doc/theming.rst
Log Message:
-----------
Merge branch '520-templating-docs'
Commit: 40409401184ee15876826d359789ea784f7241ce
https://github.com/okfn/ckan/commit/40409401184ee15876826d359789ea784f7241ce
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-05-02 (Thu, 02 May 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
Merge pull request #830 from okfn/830-dashboard-fix
Server error 500 on http://beta.ckan.org/dashboard?type=user&name=shevski
Commit: 675c0a84bf5ff30a8da0559c166e090d0606cd12
https://github.com/okfn/ckan/commit/675c0a84bf5ff30a8da0559c166e090d0606cd12
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M doc/common-error-messages.rst
M doc/index.rst
M doc/test.rst
Log Message:
-----------
Merge pull request #804 from vitorbaptista/535
[#535] Move error messages related to test to a separate page.
Commit: 03ac5a810f8b3e756cb9b705b599a1ce03b664d7
https://github.com/okfn/ckan/commit/03ac5a810f8b3e756cb9b705b599a1ce03b664d7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M doc/extensions.rst
Log Message:
-----------
[#523] Fix a typo in the docs
Commit: fe98f77f8374a637461d1deef01ea4e7ee583e9f
https://github.com/okfn/ckan/commit/fe98f77f8374a637461d1deef01ea4e7ee583e9f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
[#523] Remove broken reference to plugins.rst
Commit: 3cebb3934e5fd13043435ae2362dc66b079d13c2
https://github.com/okfn/ckan/commit/3cebb3934e5fd13043435ae2362dc66b079d13c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M ckan/plugins/interfaces.py
M doc/architecture.rst
M doc/background-tasks.rst
M doc/extensions.rst
R doc/geospatial.rst
R doc/harvesting.rst
M doc/index.rst
M doc/multilingual.rst
M doc/tag-vocabularies.rst
M doc/toolkit.rst
R doc/writing-extensions.rst
Log Message:
-----------
Merge branch '523-docs-extensions'
Commit: 6e1d325d61ea66cd197864dc9a5af5c65af183c0
https://github.com/okfn/ckan/commit/6e1d325d61ea66cd197864dc9a5af5c65af183c0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/conf.py
M doc/datastore-setup.rst
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M test-core.ini
Log Message:
-----------
[#519] Update source install docs for 2.0
Update the source install and related docs (datastore setup, solr setup,
testing) and files (deployment.ini_tmp, test-core.ini) for CKAN 2.0.
The idea is to document the setup process that OKFN is currently using
on its servers, so that the deployment docs can become the docs for the
OKFN dev team and we can dogfood our own docs, instead of having a bunch
of wiki pages, READMEs, etc. that we follow and ignoring the "official"
docs. Hopefully those can all be deleted or cut down massively once this
is done.
So both the docs now describe the layout we use on our servers, where
there's space for multiple CKAN sites on the same server, with
virtualenvs in /usr/lib/ckan/ and config files in /etc/ckan/.
- Changed default virtualenv location from `~/pyenv` to `/usr/lib/ckan/default`
- Changed default config files dir to `/etc/ckan/default`
- Added tip for developers in source install docsS symlink `/usr/lib/ckan` and
`/etc/ckan` to directories in your homedir to install ckan in your homedir
- Changed default database user from `ckanuser` to `ckan_default`
- Changed default database from `ckan_dev` to `ckan_default`
- Changed default datastore database from `datastore` to `datastore_default`
- Changed default datastore database user from `readonlyuser` to `datastore_default`
- Changed default test databases from `ckan_test` and `ckan_test_datastore` to
`ckan_test` and `datastore_test`
- Changed default `ckan.site_id` from `ckan.net` to `default`
- Disabled file log handler, rely on Apache's log files only (as we do on our
servers)
- Changed the docs to use restructured text substitutions for things like the
paths to the virtualenv and config files, database names, etc. instead of
typing them out each time
- Lots of minor formatting fixes and editing
So now we have:
virtualenv: /usr/lib/ckan/default
development.ini: /etc/ckan/default/development.ini
production.ini: /etc/ckan/default/production.ini
ckan.site_id: default
Database user: ckan_default
Database: ckan_default
Datastore user: datastore_default
Datastore db: datastore_default
Test database: ckan_test
Test datastore db: datastore_test
Commit: 02f5bad24f73c7e3f617847c76598932b40b4e43
https://github.com/okfn/ckan/commit/02f5bad24f73c7e3f617847c76598932b40b4e43
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M doc/post-installation.rst
Log Message:
-----------
[#519] Update post-installation docs
Make them fit with the changes in commit
6e1d325d61ea66cd197864dc9a5af5c65af183c0
Commit: d015114da0b3a58ef5119ee4cea01e9404e46b67
https://github.com/okfn/ckan/commit/d015114da0b3a58ef5119ee4cea01e9404e46b67
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M doc/conf.py
M doc/deployment.rst
Log Message:
-----------
[#519] Update deployment docs
Uses the same directory structure as the updated source install docs, so
you can step through the source install docs and then the deployment
docs as written and it all works.
Also updated the apache.wsgi and sites-available files to match those
that we use on our servers.
Removed CORS setup instructions as this has been builtin since CKAN 1.5.
Commit: 02cf77cff06ae2f5be670718aaccf60a1acee31e
https://github.com/okfn/ckan/commit/02cf77cff06ae2f5be670718aaccf60a1acee31e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#519] Edit source install docs
Minor edits to install from source docs
Commit: d70fc0ba6a0270de9b51f360a1c84b34ec054e42
https://github.com/okfn/ckan/commit/d70fc0ba6a0270de9b51f360a1c84b34ec054e42
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#519] Edit solr setup docs
Minor edits to solr setup docs
Commit: c634a67fee7ff99ecfa71c72490825d57c63b2cd
https://github.com/okfn/ckan/commit/c634a67fee7ff99ecfa71c72490825d57c63b2cd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/conf.py
M doc/filestore.rst
Log Message:
-----------
[#519] Update FileStore setup instructions
Commit: 9197182b39fb58f839aa2f611183be73229f1be3
https://github.com/okfn/ckan/commit/9197182b39fb58f839aa2f611183be73229f1be3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-05 (Sun, 05 May 2013)
Changed paths:
M bin/travis-build
Log Message:
-----------
[#519] Fix Travis build
Update the database and user names in travis build
Commit: a64c21e2819971c800366ca56f0f005a20c54972
https://github.com/okfn/ckan/commit/a64c21e2819971c800366ca56f0f005a20c54972
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#519] Minor edits to solr setup docs
Commit: 427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
https://github.com/okfn/ckan/commit/427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/deployment.rst
Log Message:
-----------
[#519] Add postfix to deployment docs
Commit: 6cbdcb1d1325f5115dafe68ef33db9f328e23273
https://github.com/okfn/ckan/commit/6cbdcb1d1325f5115dafe68ef33db9f328e23273
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/datastore-setup.rst
Log Message:
-----------
[#519] Minor edits to datastore docs
Minor edits to the datastore docs, from Dominik. See:
https://github.com/okfn/ckan/pull/807
Commit: c77012a7c2c20e09092e35e546f06e5361405f93
https://github.com/okfn/ckan/commit/c77012a7c2c20e09092e35e546f06e5361405f93
Author: amercader <amercadero at gmail.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M ckan/lib/base.py
M ckan/lib/render.py
Log Message:
-----------
Merge branch '808-unicode-template-fix2'
Commit: 88f9c6aa8d5acd293e906ee20ba0572b65125ad4
https://github.com/okfn/ckan/commit/88f9c6aa8d5acd293e906ee20ba0572b65125ad4
Author: John Glover <glover.john at gmail.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
Merge pull request #819 from okfn/819-abort-error-in-user-controller
Abort error in user controller
Commit: 7ced6fc9bf0347487f5032305fd0e2b5973d2634
https://github.com/okfn/ckan/commit/7ced6fc9bf0347487f5032305fd0e2b5973d2634
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/conf.py
M doc/filestore.rst
Log Message:
-----------
[#519] Docs: change restart_apache substitution to reload_apache
Commit: 6032a292d97018cf8343b597cf66e9a87372e1f5
https://github.com/okfn/ckan/commit/6032a292d97018cf8343b597cf66e9a87372e1f5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/deployment.rst
M doc/email-notifications.rst
M doc/install-from-source.rst
Log Message:
-----------
[#519] Docs: use the reload_apache substitution
Commit: 1240f0290b115761fac2d37ed90791560ebbd466
https://github.com/okfn/ckan/commit/1240f0290b115761fac2d37ed90791560ebbd466
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-06 (Mon, 06 May 2013)
Changed paths:
M doc/deployment.rst
Log Message:
-----------
[#519] Remove non-root URL deployment instructions
We've had reports from some users that this causes problems with some
CKAN features, so we don't want to recommend it until tested.
Commit: b6f7878a3dd244c98b0e2400d8dcd5a1b89b210d
https://github.com/okfn/ckan/commit/b6f7878a3dd244c98b0e2400d8dcd5a1b89b210d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#519] Replace seanh with `whoami` in source install docs
Commit: be59aaaabe93df33d0d7a7d3b7a485e264e2c187
https://github.com/okfn/ckan/commit/be59aaaabe93df33d0d7a7d3b7a485e264e2c187
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#519] Docs: changed 'supported' to 'recommended'
Commit: e88b2fbb67bcd845ea32d93a6509f025a016cc8e
https://github.com/okfn/ckan/commit/e88b2fbb67bcd845ea32d93a6509f025a016cc8e
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M doc/conf.py
M doc/datastore-setup.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/install-from-source.rst
M doc/post-installation.rst
M doc/solr-setup.rst
M doc/test.rst
M test-core.ini
Log Message:
-----------
Merge pull request #874 from okfn/519-update-deployment-docs-second-try
519 update deployment docs second try
Commit: 87d955cb17de4fb6b9dd8fd8b1dfb4cd0b447414
https://github.com/okfn/ckan/commit/87d955cb17de4fb6b9dd8fd8b1dfb4cd0b447414
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-07 (Tue, 07 May 2013)
Changed paths:
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/render.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/main.css
R ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/snippets/facet_list.html
M ckanext/datastore/db.py
M ckanext/datastore/tests/test_search.py
M doc/apps-ideas.rst
M doc/architecture.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/common-error-messages.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore-setup.rst
M doc/deployment.rst
M doc/email-notifications.rst
R doc/extension-templating.rst
M doc/extensions.rst
M doc/filestore.rst
M doc/form-integration.rst
R doc/geospatial.rst
R doc/harvesting.rst
M doc/i18n.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/multilingual.rst
M doc/post-installation.rst
M doc/release-cycle.rst
A doc/release-process.rst
M doc/solr-setup.rst
M doc/tag-vocabularies.rst
M doc/templating.rst
M doc/test.rst
M doc/theming.rst
M doc/toolkit.rst
M doc/tracking.rst
R doc/writing-extensions.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into coding-standards-tests
Conflicts:
ckan/controllers/user.py
trivial merge
Compare: https://github.com/okfn/ckan/compare/745c679d9eed...87d955cb17de
More information about the ckan-changes
mailing list