[ckan-changes] [okfn/ckan] 39bd56: [#2375] Remove non demo functionality from core in...

• Previous message: [ckan-changes] [okfn/ckan] 39bd56: [#2375] Remove non demo functionality from core in...
• Next message: [ckan-changes] [okfn/ckan] 67d425: [#2375] do not pass resources to resource snippet
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: 39bd5662c18a0ddc6e6dafb1548f05163b448edc
      https://github.com/okfn/ckan/commit/39bd5662c18a0ddc6e6dafb1548f05163b448edc
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/templates/package/read.html

  Log Message:
  -----------
  [#2375] Remove non demo functionality from core in package read


  Commit: 3c8f16f727d1c9b7501a5914da02a92c8466aab1
      https://github.com/okfn/ckan/commit/3c8f16f727d1c9b7501a5914da02a92c8466aab1
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/templates/footer.html
    A ckan/templates_legacy/snippets/follow_button.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme


  Commit: 08c73cf603d2e936788da7dd437edcecf20ceb5f
      https://github.com/okfn/ckan/commit/08c73cf603d2e936788da7dd437edcecf20ceb5f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/public/base/less/profile.less
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2375] Add very basic styles for the activity stream


  Commit: 8dc7c568c32f604027b8820e6e8dd4696adeec24
      https://github.com/okfn/ckan/commit/8dc7c568c32f604027b8820e6e8dd4696adeec24
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#2598] Fix display of arrows in Firefox on Linux


  Commit: 407e6107fd6ca9b585f4ad3416331aec7d1868dd
      https://github.com/okfn/ckan/commit/407e6107fd6ca9b585f4ad3416331aec7d1868dd
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme


  Commit: d991aebdb2d4e9f149e9717251d46a18568bc1a2
      https://github.com/okfn/ckan/commit/d991aebdb2d4e9f149e9717251d46a18568bc1a2
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    A ckan/html_resources/datapreview/datapreview.js
    A ckan/html_resources/datapreview/table-view-template.js
    A ckan/html_resources/datapreview/table-view.js
    A ckan/html_resources/datapreview/table-view.ui.js
    A ckan/html_resources/datapreview/templates.js
    A ckan/public/base/css/datapreview/table-view.css
    A ckan/public/base/images/datapreview/icon-sprite.png
    A ckan/public/base/images/datapreview/loading.gif

  Log Message:
  -----------
  [#2617] Add datapreview resources to demo


  Commit: 5f8f3c6481b176827bbcc1c5bec731e06809c32b
      https://github.com/okfn/ckan/commit/5f8f3c6481b176827bbcc1c5bec731e06809c32b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/package/read.html

  Log Message:
  -----------
  [#2617]


  Commit: ba7053c25943b1557b17105ac9713b0c52eee66b
      https://github.com/okfn/ckan/commit/ba7053c25943b1557b17105ac9713b0c52eee66b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/package/read.html

  Log Message:
  -----------
  [#2617] Add non-functioning datapreview to the resource page


  Commit: d16ae35f09936d896f7672d846b1026cdd65359e
      https://github.com/okfn/ckan/commit/d16ae35f09936d896f7672d846b1026cdd65359e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    A ckan/html_resources/config.ini
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2617] Create a datapreview group and include it


  Commit: 7a09ab2410f5877174a5f9a2f4f9d501a7baea02
      https://github.com/okfn/ckan/commit/7a09ab2410f5877174a5f9a2f4f9d501a7baea02
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2617] Require datapreview file to load datapreview group...


  Commit: 01bafd5e3767912233da15800eb801e429250a76
      https://github.com/okfn/ckan/commit/01bafd5e3767912233da15800eb801e429250a76
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    R ckan/html_resources/config.ini
    A ckan/html_resources/datapreview/config.ini

  Log Message:
  -----------
  [#2617] put .ini in correct place


  Commit: 6ea7d585e4996add3bf2013dfeb6fc516fa33261
      https://github.com/okfn/ckan/commit/6ea7d585e4996add3bf2013dfeb6fc516fa33261
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/html_resources/datapreview/config.ini

  Log Message:
  -----------
  [#2617] fix .ini


  Commit: 76c362c0ba889b17f729f0a7448124e5fa1efba8
      https://github.com/okfn/ckan/commit/76c362c0ba889b17f729f0a7448124e5fa1efba8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2617] fix fanstatic groups


  Commit: e5ccd8dada399e9fb20e88cb8433a8ddb05ec741
      https://github.com/okfn/ckan/commit/e5ccd8dada399e9fb20e88cb8433a8ddb05ec741
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    R ckan/html_resources/ckan/main.js
    R ckan/html_resources/datapreview/config.ini
    R ckan/html_resources/datapreview/datapreview.js
    R ckan/html_resources/datapreview/table-view-template.js
    R ckan/html_resources/datapreview/table-view.js
    R ckan/html_resources/datapreview/table-view.ui.js
    R ckan/html_resources/datapreview/templates.js
    R ckan/html_resources/vendor/bootstrap.js
    R ckan/public/base/css/datapreview/table-view.css
    A ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/datapreview.table-view.css
    A ckan/public/base/datapreview/css/leaflet.css
    A ckan/public/base/datapreview/css/leaflet.ie.css
    A ckan/public/base/datapreview/css/recline.graph.css
    A ckan/public/base/datapreview/css/recline.grid.css
    A ckan/public/base/datapreview/css/recline.map.css
    A ckan/public/base/datapreview/css/slick.columnpicker.css
    A ckan/public/base/datapreview/css/slick.grid.css
    A ckan/public/base/datapreview/images/icon-sprite.png
    A ckan/public/base/datapreview/images/leaflet/layers.png
    A ckan/public/base/datapreview/images/leaflet/marker-shadow.png
    A ckan/public/base/datapreview/images/leaflet/marker.png
    A ckan/public/base/datapreview/images/leaflet/popup-close.png
    A ckan/public/base/datapreview/images/leaflet/zoom-in.png
    A ckan/public/base/datapreview/images/leaflet/zoom-out.png
    A ckan/public/base/datapreview/images/loading.gif
    A ckan/public/base/datapreview/images/recline/edit-map.png
    A ckan/public/base/datapreview/images/recline/menu-dropdown.png
    A ckan/public/base/datapreview/images/recline/small-spinner.gif
    A ckan/public/base/datapreview/images/slickgrid/actions.gif
    A ckan/public/base/datapreview/images/slickgrid/ajax-loader-small.gif
    A ckan/public/base/datapreview/images/slickgrid/arrow_redo.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_right_peppermint.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_right_spearmint.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_undo.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_blue.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_star.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_toggle_minus.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_toggle_plus.png
    A ckan/public/base/datapreview/images/slickgrid/calendar.gif
    A ckan/public/base/datapreview/images/slickgrid/collapse.gif
    A ckan/public/base/datapreview/images/slickgrid/comment_yellow.gif
    A ckan/public/base/datapreview/images/slickgrid/down.gif
    A ckan/public/base/datapreview/images/slickgrid/drag-handle.png
    A ckan/public/base/datapreview/images/slickgrid/editor-helper-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/expand.gif
    A ckan/public/base/datapreview/images/slickgrid/header-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/header-columns-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/header-columns-over-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/help.png
    A ckan/public/base/datapreview/images/slickgrid/info.gif
    A ckan/public/base/datapreview/images/slickgrid/listview.gif
    A ckan/public/base/datapreview/images/slickgrid/pencil.gif
    A ckan/public/base/datapreview/images/slickgrid/row-over-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-asc.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-asc.png
    A ckan/public/base/datapreview/images/slickgrid/sort-desc.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-desc.png
    A ckan/public/base/datapreview/images/slickgrid/stripes.png
    A ckan/public/base/datapreview/images/slickgrid/tag_red.png
    A ckan/public/base/datapreview/images/slickgrid/tick.png
    A ckan/public/base/datapreview/images/slickgrid/user_identity.gif
    A ckan/public/base/datapreview/images/slickgrid/user_identity_plus.gif
    A ckan/public/base/datapreview/javascript/datapreview.js
    A ckan/public/base/datapreview/javascript/table-view-template.js
    A ckan/public/base/datapreview/javascript/table-view.js
    A ckan/public/base/datapreview/javascript/table-view.ui.js
    A ckan/public/base/datapreview/javascript/vendor/backbone.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.event.drag.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.flot.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.mustache.js
    A ckan/public/base/datapreview/javascript/vendor/leaflet.js
    A ckan/public/base/datapreview/javascript/vendor/recline.js
    A ckan/public/base/datapreview/javascript/vendor/slick.columnpicker.js
    A ckan/public/base/datapreview/javascript/vendor/slick.grid.js
    A ckan/public/base/datapreview/javascript/vendor/underscore.js
    R ckan/public/base/images/datapreview/icon-sprite.png
    R ckan/public/base/images/datapreview/loading.gif
    A ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/vendor/bootstrap.js
    A ckan/public/base/javascript/vendor/jquery.js

  Log Message:
  -----------
  [#2617] Moved all JS into public directory for development


  Commit: aa0ebd6c5e734afcc5e571638aa7cc2d7cacb27b
      https://github.com/okfn/ckan/commit/aa0ebd6c5e734afcc5e571638aa7cc2d7cacb27b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#2617] Add a main_content block to page.html


  Commit: 23f77c1509707f8c325672b91415327c2afe1701
      https://github.com/okfn/ckan/commit/23f77c1509707f8c325672b91415327c2afe1701
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2617] Temporarily use hard scripts for JS


  Commit: 99b21c93cb9e4889ce70bdb52d5589b5ed076d8b
      https://github.com/okfn/ckan/commit/99b21c93cb9e4889ce70bdb52d5589b5ed076d8b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    A ckan/templates/snippets/datapreview_embed_dialog.html

  Log Message:
  -----------
  [#2617] Add embed dialog snippet for data preview


  Commit: 28a42f07a63254545ca86d9baec48f5d68c3f13a
      https://github.com/okfn/ckan/commit/28a42f07a63254545ca86d9baec48f5d68c3f13a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2617] Add data preview to resource read page

This is a temporary implementation and still needs a fair bit of
work to make it work nicely.


  Commit: 6c8192226f39b9b1c2e858c5c05ee28da476835a
      https://github.com/okfn/ckan/commit/6c8192226f39b9b1c2e858c5c05ee28da476835a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/pages/form_page.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme


  Commit: 02f0bf31e0e86f904785a05363e78fcb10bf3534
      https://github.com/okfn/ckan/commit/02f0bf31e0e86f904785a05363e78fcb10bf3534
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M ckan/html_resources/__init__.py
    R ckan/html_resources/ckan/main.js
    R ckan/html_resources/vendor/bootstrap.js
    A ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/datapreview.table-view.css
    A ckan/public/base/datapreview/css/leaflet.css
    A ckan/public/base/datapreview/css/leaflet.ie.css
    A ckan/public/base/datapreview/css/recline.graph.css
    A ckan/public/base/datapreview/css/recline.grid.css
    A ckan/public/base/datapreview/css/recline.map.css
    A ckan/public/base/datapreview/css/slick.columnpicker.css
    A ckan/public/base/datapreview/css/slick.grid.css
    A ckan/public/base/datapreview/images/icon-sprite.png
    A ckan/public/base/datapreview/images/leaflet/layers.png
    A ckan/public/base/datapreview/images/leaflet/marker-shadow.png
    A ckan/public/base/datapreview/images/leaflet/marker.png
    A ckan/public/base/datapreview/images/leaflet/popup-close.png
    A ckan/public/base/datapreview/images/leaflet/zoom-in.png
    A ckan/public/base/datapreview/images/leaflet/zoom-out.png
    A ckan/public/base/datapreview/images/loading.gif
    A ckan/public/base/datapreview/images/recline/edit-map.png
    A ckan/public/base/datapreview/images/recline/menu-dropdown.png
    A ckan/public/base/datapreview/images/recline/small-spinner.gif
    A ckan/public/base/datapreview/images/slickgrid/actions.gif
    A ckan/public/base/datapreview/images/slickgrid/ajax-loader-small.gif
    A ckan/public/base/datapreview/images/slickgrid/arrow_redo.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_right_peppermint.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_right_spearmint.png
    A ckan/public/base/datapreview/images/slickgrid/arrow_undo.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_blue.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_star.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_toggle_minus.png
    A ckan/public/base/datapreview/images/slickgrid/bullet_toggle_plus.png
    A ckan/public/base/datapreview/images/slickgrid/calendar.gif
    A ckan/public/base/datapreview/images/slickgrid/collapse.gif
    A ckan/public/base/datapreview/images/slickgrid/comment_yellow.gif
    A ckan/public/base/datapreview/images/slickgrid/down.gif
    A ckan/public/base/datapreview/images/slickgrid/drag-handle.png
    A ckan/public/base/datapreview/images/slickgrid/editor-helper-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/expand.gif
    A ckan/public/base/datapreview/images/slickgrid/header-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/header-columns-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/header-columns-over-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/help.png
    A ckan/public/base/datapreview/images/slickgrid/info.gif
    A ckan/public/base/datapreview/images/slickgrid/listview.gif
    A ckan/public/base/datapreview/images/slickgrid/pencil.gif
    A ckan/public/base/datapreview/images/slickgrid/row-over-bg.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-asc.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-asc.png
    A ckan/public/base/datapreview/images/slickgrid/sort-desc.gif
    A ckan/public/base/datapreview/images/slickgrid/sort-desc.png
    A ckan/public/base/datapreview/images/slickgrid/stripes.png
    A ckan/public/base/datapreview/images/slickgrid/tag_red.png
    A ckan/public/base/datapreview/images/slickgrid/tick.png
    A ckan/public/base/datapreview/images/slickgrid/user_identity.gif
    A ckan/public/base/datapreview/images/slickgrid/user_identity_plus.gif
    A ckan/public/base/datapreview/javascript/datapreview.js
    A ckan/public/base/datapreview/javascript/table-view-template.js
    A ckan/public/base/datapreview/javascript/table-view.js
    A ckan/public/base/datapreview/javascript/table-view.ui.js
    A ckan/public/base/datapreview/javascript/vendor/backbone.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.event.drag.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.flot.js
    A ckan/public/base/datapreview/javascript/vendor/jquery.mustache.js
    A ckan/public/base/datapreview/javascript/vendor/leaflet.js
    A ckan/public/base/datapreview/javascript/vendor/recline.js
    A ckan/public/base/datapreview/javascript/vendor/slick.columnpicker.js
    A ckan/public/base/datapreview/javascript/vendor/slick.grid.js
    A ckan/public/base/datapreview/javascript/vendor/underscore.js
    A ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/vendor/bootstrap.js
    A ckan/public/base/javascript/vendor/jquery.js
    M ckan/templates/base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/page.html
    A ckan/templates/snippets/datapreview_embed_dialog.html

  Log Message:
  -----------
  Merge branch 'feature-2617-demo-data-preview' into feature-2375-demo-theme


Compare: https://github.com/okfn/ckan/compare/0fd1ad61a91b...02f0bf31e0e8

• Previous message: [ckan-changes] [okfn/ckan] 39bd56: [#2375] Remove non demo functionality from core in...
• Next message: [ckan-changes] [okfn/ckan] 67d425: [#2375] do not pass resources to resource snippet
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]