[ckan-changes] [ckan/ckan] 1f4f03: [#1301] Adds skip to content accessibility block
GitHub
noreply at github.com
Fri Mar 7 01:19:22 UTC 2014
Branch: refs/heads/master
Home: https://github.com/ckan/ckan
Commit: 1f4f03515e19a6cc857029ac6987b173b2128128
https://github.com/ckan/ckan/commit/1f4f03515e19a6cc857029ac6987b173b2128128
Author: John Martin <me at johnmart.in>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckan/templates/page.html
Log Message:
-----------
[#1301] Adds skip to content accessibility block
Commit: 4ec3ac0c17a09a9022a8cf8c6f1d7186436ecb8b
https://github.com/ckan/ckan/commit/4ec3ac0c17a09a9022a8cf8c6f1d7186436ecb8b
Author: John Martin <me at johnmart.in>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckan/templates/header.html
M ckan/templates/page.html
Log Message:
-----------
[#1301] Adds header label block and flash message inner
Commit: 6e881475e4ca1eec697ef56ba32f545b9ca19f32
https://github.com/ckan/ckan/commit/6e881475e4ca1eec697ef56ba32f545b9ca19f32
Author: John Martin <me at johnmart.in>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#1301] Added a couple of template blocks to the activity_streams snippet
Commit: ad3da7d73bacdf2e0eff929deb855e0b166e44f2
https://github.com/ckan/ckan/commit/ad3da7d73bacdf2e0eff929deb855e0b166e44f2
Author: John Martin <me at johnmart.in>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M ckan/templates/snippets/group_item.html
Log Message:
-----------
[#1301] Added template blocks to group_item.html
Commit: a434ebb57bdb74b0b3a7e3025f4f91930cde9bdc
https://github.com/ckan/ckan/commit/a434ebb57bdb74b0b3a7e3025f4f91930cde9bdc
Author: John Martin <me at johnmart.in>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M ckan/templates/snippets/package_list.html
Log Message:
-----------
[#1301] Adds template blocks to package_list.html
Commit: 011973d67a5da5e03761ffd2a506b2389e84fab2
https://github.com/ckan/ckan/commit/011973d67a5da5e03761ffd2a506b2389e84fab2
Author: John Martin <me at johnmart.in>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#1301] Added a few template blocks to the facet lists
Commit: b3a154ec11838702a90430e75ecbdfb1cfc974ca
https://github.com/ckan/ckan/commit/b3a154ec11838702a90430e75ecbdfb1cfc974ca
Author: John Martin <me at johnmart.in>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ckan/templates/snippets/package_item.html
Log Message:
-----------
[#1301] Added more template blocks to package_item.html snippet
Commit: 0a3f179c109d5d003ef92a0fb45b074e31e387a9
https://github.com/ckan/ckan/commit/0a3f179c109d5d003ef92a0fb45b074e31e387a9
Author: John Martin <me at johnmart.in>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ckan/templates/snippets/follow_button.html
Log Message:
-----------
[#1301] Adds blocks for follow button classes
Commit: 98628d1833175f77c1dabbdfc9c3e870262cc7df
https://github.com/ckan/ckan/commit/98628d1833175f77c1dabbdfc9c3e870262cc7df
Author: John Martin <me at johnmart.in>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/info.html
Log Message:
-----------
[#1301] Adds a load of template blocks to the package info template
Commit: d8bad906f0b07a49da9a8ba4761dac5adf45214e
https://github.com/ckan/ckan/commit/d8bad906f0b07a49da9a8ba4761dac5adf45214e
Author: John Martin <me at johnmart.in>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ckan/templates/package/read_base.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/social.html
Log Message:
-----------
[#1301] Improves the package read page snippets
Commit: 40058569eea84f8b57f07f6f6b54de0ec94f9e57
https://github.com/ckan/ckan/commit/40058569eea84f8b57f07f6f6b54de0ec94f9e57
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/snippets/tag_list.html
Log Message:
-----------
[#1301] Adds template blocks to tag_list
Commit: 570f7fc252092c6ba19606671d14adf2de44c414
https://github.com/ckan/ckan/commit/570f7fc252092c6ba19606671d14adf2de44c414
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/resources_list.html
Log Message:
-----------
[#1301] Adds template blocks to resource listings
Commit: 1b3261d1bca98c65451ef712745356acd57b995b
https://github.com/ckan/ckan/commit/1b3261d1bca98c65451ef712745356acd57b995b
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/resources.html
Log Message:
-----------
[#1301] Adds more blocks to the resources snippet
Commit: 5bb5a071be73a0095f1344bc5727f01dc2d60065
https://github.com/ckan/ckan/commit/5bb5a071be73a0095f1344bc5727f01dc2d60065
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1301] Adds template blocks to the resource_read template
Commit: fd92e56a70fc0ffa1a01a75a7a1831d790d620b1
https://github.com/ckan/ckan/commit/fd92e56a70fc0ffa1a01a75a7a1831d790d620b1
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/package/search.html
M ckan/templates/snippets/search_form.html
Log Message:
-----------
[#1301] Adds template blocks to the package search and search form
Commit: 6ed01fd4ef95ee517e2d2f77f8478349e4ed3ca8
https://github.com/ckan/ckan/commit/6ed01fd4ef95ee517e2d2f77f8478349e4ed3ca8
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/user/read_base.html
Log Message:
-----------
[#1301] Adds more template blocks to sidebar on the user profile
Commit: 8cf8d40f21111d25b8c7b90d77e2260e1a6a4ff2
https://github.com/ckan/ckan/commit/8cf8d40f21111d25b8c7b90d77e2260e1a6a4ff2
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/group_list.html
M ckan/templates/group/snippets/info.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/organization/snippets/organization_list.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#1301] Adds blocks to group and org based templates
Commit: 1d7771f3e9d9f4c136dae94113dc59547c73b749
https://github.com/ckan/ckan/commit/1d7771f3e9d9f4c136dae94113dc59547c73b749
Author: John Martin <me at johnmart.in>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_form.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1301] Adds blocks to the package form buttons
Commit: ad7c4d3291778de6cf1cb588fe761a9f1d51ae27
https://github.com/ckan/ckan/commit/ad7c4d3291778de6cf1cb588fe761a9f1d51ae27
Author: John Martin <me at johnmart.in>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#1301] Adds hanging enblock
Commit: 82f1447ecb6951b8db019cdaf207c2f628df312b
https://github.com/ckan/ckan/commit/82f1447ecb6951b8db019cdaf207c2f628df312b
Author: John Martin <me at johnmart.in>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/templates/user/login.html
M ckan/templates/user/new.html
M ckan/templates/user/new_user_form.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
[#1301] Adds more template blocks to the user forms
Commit: 806826796c57bf4e997890043ef5877d9d6408c1
https://github.com/ckan/ckan/commit/806826796c57bf4e997890043ef5877d9d6408c1
Author: John Martin <me at johnmart.in>
Date: 2014-02-11 (Tue, 11 Feb 2014)
Changed paths:
R .gitmodules
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M MANIFEST.in
M README.rst
R bin/travis-build
A bin/travis-install-dependencies
A bin/travis-run-tests
M ckan/__init__.py
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/config/who.ini
M ckan/controllers/api.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/user.py
M ckan/lib/accept.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/munge.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.py
A ckan/lib/uploader.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/__init__.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/test_init.py
M ckan/new_tests/logic/test_validators.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/custom-fields.js
A ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
M ckan/public/base/test/spec/modules/custom-fields.spec.js
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
R ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/home/layout1.html
M ckan/templates/home/layout2.html
M ckan/templates/home/layout3.html
M ckan/templates/home/snippets/promoted.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/edit_base.html
A ckan/templates/package/group_list.html
M ckan/templates/package/new.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/new_resource_not_draft.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_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/search_result_text.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/login.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_related.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
R ckan_deb/DEBIAN/control.template
R ckan_deb/usr/bin/ckan-create-instance
R ckan_deb/usr/bin/ckan-instance-maintenance
R ckan_deb/usr/bin/ckan-setup-solr
R ckan_deb/usr/lib/ckan/common.sh
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
R ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v4.py
A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
A ckanext/example_theme/__init__.py
A ckanext/example_theme/custom_config_setting/__init__.py
A ckanext/example_theme/custom_config_setting/plugin.py
A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
A ckanext/example_theme/custom_config_setting/templates/snippets
A ckanext/example_theme/v01_empty_extension/__init__.py
A ckanext/example_theme/v01_empty_extension/plugin.py
A ckanext/example_theme/v02_empty_template/__init__.py
A ckanext/example_theme/v02_empty_template/plugin.py
A ckanext/example_theme/v02_empty_template/templates/home/index.html
A ckanext/example_theme/v03_jinja/__init__.py
A ckanext/example_theme/v03_jinja/plugin.py
A ckanext/example_theme/v03_jinja/templates/home/index.html
A ckanext/example_theme/v04_ckan_extends/__init__.py
A ckanext/example_theme/v04_ckan_extends/plugin.py
A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
A ckanext/example_theme/v05_block/__init__.py
A ckanext/example_theme/v05_block/plugin.py
A ckanext/example_theme/v05_block/templates/home/layout1.html
A ckanext/example_theme/v06_super/__init__.py
A ckanext/example_theme/v06_super/plugin.py
A ckanext/example_theme/v06_super/templates/home/layout1.html
A ckanext/example_theme/v07_helper_function/__init__.py
A ckanext/example_theme/v07_helper_function/plugin.py
A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
A ckanext/example_theme/v08_custom_helper_function/__init__.py
A ckanext/example_theme/v08_custom_helper_function/plugin.py
A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
A ckanext/example_theme/v09_snippet/__init__.py
A ckanext/example_theme/v09_snippet/plugin.py
A ckanext/example_theme/v09_snippet/templates/home/layout1.html
A ckanext/example_theme/v10_custom_snippet/__init__.py
A ckanext/example_theme/v10_custom_snippet/plugin.py
A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
A ckanext/example_theme/v12_extra_public_dir/__init__.py
A ckanext/example_theme/v12_extra_public_dir/plugin.py
A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
A ckanext/example_theme/v12_extra_public_dir/templates/snippets
A ckanext/example_theme/v13_custom_css/__init__.py
A ckanext/example_theme/v13_custom_css/plugin.py
A ckanext/example_theme/v13_custom_css/public/example_theme.css
A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
A ckanext/example_theme/v13_custom_css/templates/base.html
A ckanext/example_theme/v13_custom_css/templates/home
A ckanext/example_theme/v13_custom_css/templates/snippets
A ckanext/example_theme/v14_more_custom_css/__init__.py
A ckanext/example_theme/v14_more_custom_css/plugin.py
A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
A ckanext/example_theme/v14_more_custom_css/templates
A ckanext/example_theme/v15_fanstatic/__init__.py
A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
A ckanext/example_theme/v15_fanstatic/plugin.py
A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
A ckanext/example_theme/v15_fanstatic/templates/base.html
A ckanext/example_theme/v15_fanstatic/templates/home
A ckanext/example_theme/v15_fanstatic/templates/snippets
A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
A ckanext/example_theme/v16_initialize_a_javascript_module/public
A ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
M ckanext/textpreview/tests/test_preview.py
M dev-requirements.txt
A doc/.gitignore
A doc/_static/ckanlogo.png
M doc/_templates/footer.html
R doc/_themes/sphinx-theme-okfn
R doc/api.rst
A doc/api/index.rst
A doc/api/legacy-api.rst
R doc/apps-ideas.rst
R doc/authorization.rst
R doc/background-tasks.rst
R doc/ckan-coding-standards.rst
M doc/conf.py
R doc/configuration.rst
A doc/contents.rst
R doc/contributing.rst
A doc/contributing/architecture.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
A doc/contributing/documentation.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/html.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/javascript.rst
A doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/release-process.rst
A doc/contributing/reviewing.rst
A doc/contributing/test.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
R doc/css-coding-standards.rst
R doc/data-viewer.rst
R doc/datastore.rst
R doc/deployment.rst
R doc/documentation-guidelines.rst
R doc/email-notifications.rst
M doc/extensions/best-practices.rst
A doc/extensions/custom-config-settings.rst
M doc/extensions/index.rst
M doc/extensions/testing-extensions.rst
M doc/extensions/tutorial.rst
R doc/features.rst
R doc/filestore.rst
R doc/form-integration.rst
R doc/frontend-development.rst
R doc/getting-started.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
R doc/images/ckan_logo_box.png
A doc/images/create_organization.jpg
A doc/images/custom-css.png
A doc/images/customize_look_and_feel.jpg
A doc/images/debug-footer.png
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/extra-public-dir.png
A doc/images/html_and_css.png
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/more-custom-css.png
A doc/images/most-popular-groups-custom-snippet.png
A doc/images/most-popular-groups-snippet.png
A doc/images/most-popular-groups.png
A doc/images/move_dataset_between_organizations.jpg
A doc/images/recently-changed-packages-activity-stream.png
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
R doc/install-from-package.rst
R doc/install-from-source.rst
R doc/installing.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/legacy-api.rst
R doc/linked-data-and-rdf.rst
A doc/maintaining/apps-ideas.rst
A doc/maintaining/authorization.rst
A doc/maintaining/background-tasks.rst
A doc/maintaining/configuration.rst
A doc/maintaining/data-viewer.rst
A doc/maintaining/datastore.rst
A doc/maintaining/email-notifications.rst
A doc/maintaining/filestore.rst
A doc/maintaining/form-integration.rst
A doc/maintaining/getting-started.rst
A doc/maintaining/index.rst
A doc/maintaining/installing/deployment.rst
A doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-from-package.rst
A doc/maintaining/installing/install-from-source.rst
A doc/maintaining/linked-data-and-rdf.rst
A doc/maintaining/multilingual.rst
A doc/maintaining/paster.rst
A doc/maintaining/solr-multicore.rst
A doc/maintaining/stats.rst
A doc/maintaining/tag-vocabularies.rst
A doc/maintaining/tracking.rst
A doc/maintaining/upgrading/index.rst
A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
A doc/maintaining/upgrading/upgrade-source.rst
R doc/migration.rst
R doc/multilingual.rst
R doc/paster.rst
R doc/python-coding-standards.rst
R doc/release-process.rst
R doc/resources.rst
R doc/solr-setup.rst
R doc/stats.rst
A doc/sysadmin-guide.rst
R doc/tag-vocabularies.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/test.rst
R doc/testing-coding-standards.rst
R doc/theming.rst
A doc/theming/best-practices.rst
A doc/theming/css.rst
A doc/theming/fanstatic.rst
A doc/theming/index.rst
A doc/theming/javascript.rst
A doc/theming/jinja-tags.rst
A doc/theming/static-files.rst
A doc/theming/substitutions.rst
A doc/theming/template-helper-functions.rst
A doc/theming/template-snippets.rst
A doc/theming/templates.rst
A doc/theming/variables-and-functions.rst
R doc/tracking.rst
R doc/upgrade-package-ckan-1-to-2.rst
R doc/upgrade-package-to-minor-release.rst
R doc/upgrade-package-to-patch-release.rst
R doc/upgrade-source.rst
R doc/upgrading.rst
A doc/user-guide.rst
M requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merged master
Commit: cd85bff7032fccb44b29ddefbc2e9adfc1317cba
https://github.com/ckan/ckan/commit/cd85bff7032fccb44b29ddefbc2e9adfc1317cba
Author: kindly <kindly at gmail.com>
Date: 2014-03-06 (Thu, 06 Mar 2014)
Changed paths:
M .travis.yml
M .tx/config
A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
M bin/travis-install-dependencies
M ckan/config/routing.py
M ckan/controllers/feed.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/i18n/ar/LC_MESSAGES/ckan.mo
M ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
A ckan/i18n/he/LC_MESSAGES/ckan.mo
A ckan/i18n/he/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/km/LC_MESSAGES/ckan.mo
M ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
A ckan/i18n/vi/LC_MESSAGES/ckan.mo
A ckan/i18n/vi/LC_MESSAGES/ckan.po
A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/cli.py
M ckan/logic/action/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/model/license.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/action/__init__.py
M ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/auth/__init__.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/templates/admin/index.html
M ckan/templates/header.html
M ckan/templates/home/snippets/search.html
M ckan/templates/organization/snippets/feeds.html
M ckan/templates/user/request_reset.html
M ckan/tests/functional/test_user.py
M ckan/tests/logic/test_action.py
M ckan/tests/test_coding_standards.py
A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
R ckanext/example_theme/v16_initialize_a_javascript_module/public
R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
A ckanext/example_theme/v17_popover/__init__.py
A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
A ckanext/example_theme/v17_popover/plugin.py
A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
A ckanext/example_theme/v18_snippet_api/__init__.py
A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
A ckanext/example_theme/v18_snippet_api/plugin.py
A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
A ckanext/example_theme/v19_01_error/__init__.py
A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
A ckanext/example_theme/v19_01_error/plugin.py
A ckanext/example_theme/v19_01_error/templates
A ckanext/example_theme/v19_02_error_handling/__init__.py
A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
A ckanext/example_theme/v19_02_error_handling/plugin.py
A ckanext/example_theme/v19_02_error_handling/templates
A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
A ckanext/example_theme/v20_pubsub/plugin.py
A ckanext/example_theme/v20_pubsub/templates
A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
M doc/conf.py
M doc/contributing/documentation.rst
M doc/extensions/testing-extensions.rst
A doc/images/example_theme_javascript_popover.png
A doc/images/example_theme_overlapping_popovers.png
M doc/maintaining/datastore.rst
M doc/theming/best-practices.rst
M doc/theming/index.rst
A doc/theming/javascript-api-client.rst
A doc/theming/javascript-module-objects-and-methods.rst
A doc/theming/javascript-sandbox.rst
M doc/theming/javascript.rst
A doc/theming/jquery-plugins.rst
M setup.py
Log Message:
-----------
fix basic merge conflicts
Commit: fc1edfd27fa2d5d598a225d4ef234a3664bfeeec
https://github.com/ckan/ckan/commit/fc1edfd27fa2d5d598a225d4ef234a3664bfeeec
Author: kindly <kindly at gmail.com>
Date: 2014-03-06 (Thu, 06 Mar 2014)
Changed paths:
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/group_list.html
M ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/resources.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/page.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_item.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/social.html
M ckan/templates/snippets/tag_list.html
M ckan/templates/user/login.html
M ckan/templates/user/new.html
M ckan/templates/user/new_user_form.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
Merge branch '1301-template-blocks'
Compare: https://github.com/ckan/ckan/compare/a499b3472e27...fc1edfd27fa2
More information about the ckan-changes
mailing list