[ckan-changes] [ckan/ckan] 78257a: Changes to the way of uploading the CKAN logo imag...

• Previous message: [ckan-changes] [ckan/ckan] 78257a: Changes to the way of uploading the CKAN logo imag...
• Next message: [ckan-changes] [ckan/ckan] fbb341: PEP8
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/3414-datastore-info
  Home:   https://github.com/ckan/ckan
  Commit: 78257ad105525d449d73452093da073aafe0a7da
      https://github.com/ckan/ckan/commit/78257ad105525d449d73452093da073aafe0a7da
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-09 (Mon, 09 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/logic/schema.py
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Changes to the way of uploading the CKAN logo image. In the form we will have image upload control.


  Commit: e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
      https://github.com/ckan/ckan/commit/e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    A .travis.yml
    M Dockerfile
    M ckan/authz.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.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/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/model/dashboard.py
    M ckan/model/system_info.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/test_common.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/test_tag_vocab_plugin.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ckan/ckan into ckan-logo-upload


  Commit: 56d171b5a4610292b723cdf14c7d3c46c8d2d23b
      https://github.com/ckan/ckan/commit/56d171b5a4610292b723cdf14c7d3c46c8d2d23b
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M .circleci-matrix.yml
    M CHANGELOG.rst
    M ckan/ckan_nose_plugin.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/templates/user/dashboard_organizations.html
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into ckan-logo-upload


  Commit: c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
      https://github.com/ckan/ckan/commit/c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  added logic for uploading the logo image


  Commit: 2a4cc29b37606e3cce5567a1337a63b9d76e465d
      https://github.com/ckan/ckan/commit/2a4cc29b37606e3cce5567a1337a63b9d76e465d
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/group.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: cba5a9b4dc9763d23a30180e9a48a45449d85ea8
      https://github.com/ckan/ckan/commit/cba5a9b4dc9763d23a30180e9a48a45449d85ea8
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 9ed8c525da9a85ba7a878dd2f108a2c39411546a
      https://github.com/ckan/ckan/commit/9ed8c525da9a85ba7a878dd2f108a2c39411546a
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 55782c32892147bf127f33866ddc168a430fbfe7
      https://github.com/ckan/ckan/commit/55782c32892147bf127f33866ddc168a430fbfe7
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 01547b579477e8b85a348e20a647ee8fe5d97921
      https://github.com/ckan/ckan/commit/01547b579477e8b85a348e20a647ee8fe5d97921
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
   Fix in test case, instead of ckan.site_logo is used image_url


  Commit: 82b7a18b0719e8f2a895503032b0265888857cbb
      https://github.com/ckan/ckan/commit/82b7a18b0719e8f2a895503032b0265888857cbb
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    A ckan/public/base/vendor/font-awesome/less/less/core.less
    A ckan/public/base/vendor/font-awesome/less/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/less/list.less
    A ckan/public/base/vendor/font-awesome/less/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/less/path.less
    A ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/less/stacked.less
    A ckan/public/base/vendor/font-awesome/less/less/variables.less

  Log Message:
  -----------
  upgrade font-awesome to v4.0.3


  Commit: 19ef8ee5d9686a4dd24dc94ad51da35c02274446
      https://github.com/ckan/ckan/commit/19ef8ee5d9686a4dd24dc94ad51da35c02274446
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    R ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    R ckan/public/base/vendor/font-awesome/less/less/core.less
    R ckan/public/base/vendor/font-awesome/less/less/extras.less
    R ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    R ckan/public/base/vendor/font-awesome/less/less/icons.less
    R ckan/public/base/vendor/font-awesome/less/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/list.less
    R ckan/public/base/vendor/font-awesome/less/less/mixins.less
    R ckan/public/base/vendor/font-awesome/less/less/path.less
    R ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    R ckan/public/base/vendor/font-awesome/less/less/spinning.less
    R ckan/public/base/vendor/font-awesome/less/less/stacked.less
    R ckan/public/base/vendor/font-awesome/less/less/variables.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less

  Log Message:
  -----------
  fix directory for font-awesome


  Commit: 7cae1c84fd4cdbe0e4bd48a8bdacb2012567d889
      https://github.com/ckan/ckan/commit/7cae1c84fd4cdbe0e4bd48a8bdacb2012567d889
  Author: fanjinfei <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_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/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/stats/templates/ckanext/stats/index.html
    M doc/_templates/footer.html

  Log Message:
  -----------
  update templates for font-awesome 4


  Commit: 83ff40e40a43c4fa4e9f27c7769bd434b0a57277
      https://github.com/ckan/ckan/commit/83ff40e40a43c4fa4e9f27c7769bd434b0a57277
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/search.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  additional icon update


  Commit: 6ef85695e47c5e3e0b87869916d9b6e681a523d1
      https://github.com/ckan/ckan/commit/6ef85695e47c5e3e0b87869916d9b6e681a523d1
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  icon update for fontawesome 4.x


  Commit: e458c59179c6c0b501a707f27707c96ce8db73a8
      https://github.com/ckan/ckan/commit/e458c59179c6c0b501a707f27707c96ce8db73a8
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 2


  Commit: 6e12b6a23b4e8ce481ee3439a19d3d26db5b10fc
      https://github.com/ckan/ckan/commit/6e12b6a23b4e8ce481ee3439a19d3d26db5b10fc
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 3


  Commit: e8e3c7d7fe59ea92ffd0bdcebbf93edd250ab63a
      https://github.com/ckan/ckan/commit/e8e3c7d7fe59ea92ffd0bdcebbf93edd250ab63a
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    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/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  update css, js file for font-awesome 4.x


  Commit: 75338d4834a74a7fac9ec4bfc820a95c5b1df93c
      https://github.com/ckan/ckan/commit/75338d4834a74a7fac9ec4bfc820a95c5b1df93c
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less

  Log Message:
  -----------
  remove font-awesome 3.2.1 file


  Commit: a41168bf33e309e4ab43f9659b69d55d8e1c6345
      https://github.com/ckan/ckan/commit/a41168bf33e309e4ab43f9659b69d55d8e1c6345
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    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/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  remove ie7 support for font-awesome 4.x


  Commit: 2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
      https://github.com/ckan/ckan/commit/2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/autoform.html
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  Ckan logo uload fixed


  Commit: 33a74b49e0fd04593f306ae50afae69de6cd0a9f
      https://github.com/ckan/ckan/commit/33a74b49e0fd04593f306ae50afae69de6cd0a9f
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Merge branch 'ckan-logo-upload' of https://github.com/tino097/ckan into tino097-ckan-logo-upload


  Commit: ea9d5ac1a7c2d26a52cdced5be3385953b4704d1
      https://github.com/ckan/ckan/commit/ea9d5ac1a7c2d26a52cdced5be3385953b4704d1
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Merge branch 'tino097-ckan-logo-upload'


  Commit: 56ab0a670cc965c54fa710fc506487ae177593f5
      https://github.com/ckan/ckan/commit/56ab0a670cc965c54fa710fc506487ae177593f5
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  update changelog for font-awesome 4.0.3


  Commit: 0bb141ae43b51f2c095fba87750c5fdaa00ee816
      https://github.com/ckan/ckan/commit/0bb141ae43b51f2c095fba87750c5fdaa00ee816
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/routing.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.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/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.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/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.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/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_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/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M doc/_templates/footer.html

  Log Message:
  -----------
  Merge pull request #3400 from fanjinfei/master

upgrade font-awesome to v4.0.3


  Commit: 10b60d555df30a4be8240450d031fbc6079084ca
      https://github.com/ckan/ckan/commit/10b60d555df30a4be8240450d031fbc6079084ca
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/templates/package/resource_edit_base.html
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] remove if datapusher in g.plugins from core templates


  Commit: 7ebfe61423e0d42477297c71184606bc4f13642d
      https://github.com/ckan/ckan/commit/7ebfe61423e0d42477297c71184606bc4f13642d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.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/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.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/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.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/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_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/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M doc/_templates/footer.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3414-datastore-info


  Commit: f6d0669b3cd19e3d090c255a71a22ee7874d27d1
      https://github.com/ckan/ckan/commit/f6d0669b3cd19e3d090c255a71a22ee7874d27d1
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    R ckan/templates/package/resource_data.html
    A ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


  Commit: b352b74a1902c16c93755a1765ca765294f012ff
      https://github.com/ckan/ckan/commit/b352b74a1902c16c93755a1765ca765294f012ff
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    R ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


  Commit: c728ea428883390451be346715f611015cda1c7e
      https://github.com/ckan/ckan/commit/c728ea428883390451be346715f611015cda1c7e
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] display Data Dictionary form


  Commit: 209204257f4b3c30e388ee632b528c9525cf755e
      https://github.com/ckan/ckan/commit/209204257f4b3c30e388ee632b528c9525cf755e
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/templates/datastore/dictionary.html

  Log Message:
  -----------
  [#3414] working Data Dictionary form


Compare: https://github.com/ckan/ckan/compare/685842ea036f...209204257f4b

• Previous message: [ckan-changes] [ckan/ckan] 78257a: Changes to the way of uploading the CKAN logo imag...
• Next message: [ckan-changes] [ckan/ckan] fbb341: PEP8
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]