[ckan-changes] [ckan/ckan] f615d8: Fix issue #4239

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: f615d818ff3ae7069e1799fe5f07c4b869e7290d
      https://github.com/ckan/ckan/commit/f615d818ff3ae7069e1799fe5f07c4b869e7290d
  Author: Goce Mitevski <goce.mitevski at keitaro.com>
  Date:   2018-05-07 (Mon, 07 May 2018)

  Changed paths:
    M ckan/public/base/less/resource-view.less
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  Fix issue #4239


  Commit: 1eb17ac2fb71dbc350ee6d4707740537db8b624e
      https://github.com/ckan/ckan/commit/1eb17ac2fb71dbc350ee6d4707740537db8b624e
  Author: Goce Mitevski <goce.mitevski at keitaro.com>
  Date:   2018-05-07 (Mon, 07 May 2018)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/resource-view.less
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.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

  Log Message:
  -----------
  Resolve merging conflicts


  Commit: 2e6420e92693ad61c3c5c0a716a88a8f9459fa29
      https://github.com/ckan/ckan/commit/2e6420e92693ad61c3c5c0a716a88a8f9459fa29
  Author: Konstantin Sivakov <konstantin.sivakov at keitaro.com>
  Date:   2018-05-07 (Mon, 07 May 2018)

  Changed paths:
    M ckan/public/base/less/resource-view.less
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  Merge pull request #4242 from gocemitevski/resource-view-fullscreen-embed-btns

Add missing CSS class to Fullscreen and Embed buttons


Compare: https://github.com/ckan/ckan/compare/c24d9d1e0902...2e6420e92693
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.