[ckan-changes] [okfn/ckan] 803ea5: Merge branch '300-frontend-dependancies' into 354-...
GitHub
noreply at github.com
Thu Feb 21 16:38:58 UTC 2013
Branch: refs/heads/master
Home: https://github.com/okfn/ckan
Commit: 803ea54e2f7fbb48db30c213689fb74ef7d0e223
https://github.com/okfn/ckan/commit/803ea54e2f7fbb48db30c213689fb74ef7d0e223
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
A ckan/public/base/less/font-awesome.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/.jshintrc
A ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
A ckan/public/base/vendor/bootstrap/js/tests/index.html
A ckan/public/base/vendor/bootstrap/js/tests/phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/server.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
A ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
M ckan/public/base/vendor/bootstrap/less/accordion.less
M ckan/public/base/vendor/bootstrap/less/alerts.less
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
M ckan/public/base/vendor/bootstrap/less/button-groups.less
M ckan/public/base/vendor/bootstrap/less/buttons.less
M ckan/public/base/vendor/bootstrap/less/carousel.less
M ckan/public/base/vendor/bootstrap/less/close.less
M ckan/public/base/vendor/bootstrap/less/code.less
M ckan/public/base/vendor/bootstrap/less/component-animations.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/forms.less
M ckan/public/base/vendor/bootstrap/less/grid.less
M ckan/public/base/vendor/bootstrap/less/hero-unit.less
M ckan/public/base/vendor/bootstrap/less/labels-badges.less
M ckan/public/base/vendor/bootstrap/less/layouts.less
A ckan/public/base/vendor/bootstrap/less/media.less
M ckan/public/base/vendor/bootstrap/less/mixins.less
M ckan/public/base/vendor/bootstrap/less/modals.less
M ckan/public/base/vendor/bootstrap/less/navbar.less
M ckan/public/base/vendor/bootstrap/less/navs.less
M ckan/public/base/vendor/bootstrap/less/pager.less
M ckan/public/base/vendor/bootstrap/less/pagination.less
M ckan/public/base/vendor/bootstrap/less/popovers.less
M ckan/public/base/vendor/bootstrap/less/progress-bars.less
M ckan/public/base/vendor/bootstrap/less/reset.less
M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/bootstrap/less/scaffolding.less
M ckan/public/base/vendor/bootstrap/less/sprites.less
M ckan/public/base/vendor/bootstrap/less/tables.less
A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
A ckan/public/base/vendor/bootstrap/less/tests/forms.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
M ckan/public/base/vendor/bootstrap/less/thumbnails.less
M ckan/public/base/vendor/bootstrap/less/tooltip.less
M ckan/public/base/vendor/bootstrap/less/type.less
M ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
M ckan/public/base/vendor/bootstrap/less/wells.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/index.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
M ckan/templates/organization/index.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/base_form_page.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
Merge branch '300-frontend-dependancies' into 354-ia-review
Commit: fe934bca0539cfe480aa78ce44d6a87eae0f6796
https://github.com/okfn/ckan/commit/fe934bca0539cfe480aa78ce44d6a87eae0f6796
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/variables.less
Log Message:
-----------
[#354] Tweaked variables.less to remove uneeded junk
Commit: 4032fc42a914cc22a4247f1c4620b56d7d86d087
https://github.com/okfn/ckan/commit/4032fc42a914cc22a4247f1c4620b56d7d86d087
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/page.html
Log Message:
-----------
[#354] Made pages full width
Commit: dc0310eb98545364c4644f061d02f1a4da1b0343
https://github.com/okfn/ckan/commit/dc0310eb98545364c4644f061d02f1a4da1b0343
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
A ckan/public/base/images/nav.png
M ckan/public/base/less/ckan.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/templates/home/about.html
M ckan/templates/package/snippets/info.html
Log Message:
-----------
[#354] Lot's of minor tweaks to individual pages
Commit: fdbf7f7ee0fa03aaae8b507660053ac905848db5
https://github.com/okfn/ckan/commit/fdbf7f7ee0fa03aaae8b507660053ac905848db5
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/variables.less
M ckan/templates/header.html
Log Message:
-----------
[#354] Added user masthead
Commit: 690bbb03f81a1421a808e51e4fe4f85ad8891dcf
https://github.com/okfn/ckan/commit/690bbb03f81a1421a808e51e4fe4f85ad8891dcf
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
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
Log Message:
-----------
[#354] Updated placeholder images to use font awesome
Commit: f209fd3b42706784c444e5007c6ca46681e569bd
https://github.com/okfn/ckan/commit/f209fd3b42706784c444e5007c6ca46681e569bd
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/profile.less
M ckan/templates/group/read_base.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/edit.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/back_to_user_action.html
Log Message:
-----------
[#354] Updated left side bar class and all relevant pages
Commit: 8f07b4f15392df7fe6f37ca3219592c09779f335
https://github.com/okfn/ckan/commit/8f07b4f15392df7fe6f37ca3219592c09779f335
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/lib/cli.py
A ckan/public/base/images/nav-active.png
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/variables.less
M ckan/templates/group/about.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/organization/about.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
A ckan/templates/package/about.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/snippets/info.html
M ckan/templates/snippets/social.html
Log Message:
-----------
[#354] Package pages now work within the new iA now
Commit: b998a05b1bbbdd5e42a81d21a8ec6aec3d35a31d
https://github.com/okfn/ckan/commit/b998a05b1bbbdd5e42a81d21a8ec6aec3d35a31d
Author: John Martin <me at johnmart.in>
Date: 2013-02-06 (Wed, 06 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/toolbar.less
M ckan/templates/group/read_base.html
M ckan/templates/organization/about.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/read_base.html
A ckan/templates/package/base.html
M ckan/templates/package/edit.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/page.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#354] Moved action buttons and dataset page now works better
Commit: 7ad5f1de07197f136ac5b7a5d73806790a418c25
https://github.com/okfn/ckan/commit/7ad5f1de07197f136ac5b7a5d73806790a418c25
Author: John Martin <me at johnmart.in>
Date: 2013-02-06 (Wed, 06 Feb 2013)
Changed paths:
A ckan/public/base/images/bg.png
M ckan/public/base/less/ckan.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
M ckan/templates/organization/edit_base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/snippets/resources_list.html
Log Message:
-----------
[#354] Added noise to background and a load of template tweaks
Commit: 03d01cb868a9856bb8e872bbb89e57baaffe66e3
https://github.com/okfn/ckan/commit/03d01cb868a9856bb8e872bbb89e57baaffe66e3
Author: John Martin <me at johnmart.in>
Date: 2013-02-06 (Wed, 06 Feb 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/public/base/less/module.less
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/members.html
Log Message:
-----------
[#354] Tweaks to the groups and orgs templates
Commit: 6929425c4462a9f0d699c34b3f29e8c871a78679
https://github.com/okfn/ckan/commit/6929425c4462a9f0d699c34b3f29e8c871a78679
Author: John Martin <me at johnmart.in>
Date: 2013-02-06 (Wed, 06 Feb 2013)
Changed paths:
M ckan/public/base/less/icons.less
M ckan/public/base/less/module.less
M ckan/templates/package/base.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
R ckan/templates/package/snippets/back_to_package_action.html
A ckan/templates/package/snippets/package_context.html
Log Message:
-----------
[#354] Few more tweaks to the templates
Commit: 1f2f6efbfc4d412c560ffeda551d3e7501935a11
https://github.com/okfn/ckan/commit/1f2f6efbfc4d412c560ffeda551d3e7501935a11
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/schema.py
M ckan/model/meta.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/modules/data-viewer.js
M ckan/public/base/less/forms.less
M ckan/templates/admin/authz.html
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/group/read_base.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/related.html
M ckan/templates/user/read.html
M ckan/tests/lib/test_dictization_schema.py
M ckanext/datastore/plugin.py
M ckanext/reclinepreview/theme/public/preview_recline.js
M ckanext/reclinepreview/theme/public/resource.config
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.js
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
M ckanext/reclinepreview/theme/templates/recline.html
M doc/install-from-source.rst
Log Message:
-----------
Merge master
Commit: 6cda8d7d2cab9352307d554d39ca0ff00d6c123e
https://github.com/okfn/ckan/commit/6cda8d7d2cab9352307d554d39ca0ff00d6c123e
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/search.html
Log Message:
-----------
[#354] Simplified package templates around breadcrumbs
Commit: e15f111373b58d03eaa50b1c59b4b3de25e6abf4
https://github.com/okfn/ckan/commit/e15f111373b58d03eaa50b1c59b4b3de25e6abf4
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/snippets/resources_list.html
Log Message:
-----------
[#354] Reverted some tweaks to the dataset page
Commit: ef80704a59830688dc21bcb934cacf9f376ab8d6
https://github.com/okfn/ckan/commit/ef80704a59830688dc21bcb934cacf9f376ab8d6
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/mixins.less
M ckan/templates/home/index.html
Log Message:
-----------
[#354] Small tweaks to the homepage to make it work with the new layout.less
Commit: a6e842510bd03fed0e1a3bd3088e2064910d476f
https://github.com/okfn/ckan/commit/a6e842510bd03fed0e1a3bd3088e2064910d476f
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/templates/error_document_template.html
Log Message:
-----------
[#354] Fixes error document in new iA
Commit: ef0c5e6f33f722b2094b335ecf3080f05e7427ef
https://github.com/okfn/ckan/commit/ef0c5e6f33f722b2094b335ecf3080f05e7427ef
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
[#354] Spaces not tabs
Commit: ba48e8f1d461aa79460ef438af9c341eae07b8dc
https://github.com/okfn/ckan/commit/ba48e8f1d461aa79460ef438af9c341eae07b8dc
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
[#354] Final tweaks to the header
Commit: 460afb906abd4b4535e24d959325fa546924817c
https://github.com/okfn/ckan/commit/460afb906abd4b4535e24d959325fa546924817c
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#354] Update for editing resources breadcrumbs
Commit: 781973040c1eb23520c27a8e4067906c4829eb37
https://github.com/okfn/ckan/commit/781973040c1eb23520c27a8e4067906c4829eb37
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/ckan.less
A ckan/public/base/less/homepage.less
M ckan/public/base/less/layout.less
Log Message:
-----------
[#354] Moved homepage css
Commit: 7afe230775d432235e061413e933a046f1c2601d
https://github.com/okfn/ckan/commit/7afe230775d432235e061413e933a046f1c2601d
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/homepage.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/templates/snippets/group_item.html
Log Message:
-----------
[#354] Small tweaks to the homepage
Commit: 85d925c68ce6d9b9b6880f4fb3fa0cda2155477d
https://github.com/okfn/ckan/commit/85d925c68ce6d9b9b6880f4fb3fa0cda2155477d
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/public/base/less/follower-list.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/nav.less
M ckan/templates/admin/authz.html
A ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/confirm_reset.html
M ckan/templates/admin/index.html
R ckan/templates/admin/snippets/header.html
M ckan/templates/header.html
M ckan/templates/user/list.html
M ckan/templates/user/snippets/followers.html
Log Message:
-----------
[#354] Tweaks to sysadmin templates
Commit: 6fc6a579331891983379cd68da0a422e2056b51d
https://github.com/okfn/ckan/commit/6fc6a579331891983379cd68da0a422e2056b51d
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/templates/admin/authz.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
Log Message:
-----------
[#354] Added some helper text to the sysadmin pages
Commit: e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
https://github.com/okfn/ckan/commit/e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/model/activity.py
M ckan/public/base/css/main.css
A ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/masthead.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/ajax_snippets/popover_context_group.html
M ckan/templates/home/index.html
A ckan/templates/snippets/popover_context.html
M ckan/templates/user/dashboard.html
A ckan/templates/user/snippets/followee_dropdown.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#354] Merge fixes for master
Commit: 10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
https://github.com/okfn/ckan/commit/10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
[#354] Merge fixes for masthead
Commit: 17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
https://github.com/okfn/ckan/commit/17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/dashboard.less
M ckan/templates/user/dashboard.html
Log Message:
-----------
[#354] Tweaks to dashboard after master merge
Commit: 883f668f4d539faff06b1fb83827050bc39fd3ed
https://github.com/okfn/ckan/commit/883f668f4d539faff06b1fb83827050bc39fd3ed
Author: John Martin <me at johnmart.in>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/templates/home/index.html
Log Message:
-----------
[#354] Homepage template fix from bad merge
Commit: c3c2ed2743be5265625fcf643bf19ae70cc6bb11
https://github.com/okfn/ckan/commit/c3c2ed2743be5265625fcf643bf19ae70cc6bb11
Author: John Martin <me at johnmart.in>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/public/base/less/ckan.less
M ckan/templates/header.html
M ckan/templates/package/read.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
A ckan/templates/user/edit_base.html
Log Message:
-----------
[#354] Simplifying the iA of the dashboard and edit profile pages
Commit: 2bce23c96833ebe31970c125fb18ed9b71112f50
https://github.com/okfn/ckan/commit/2bce23c96833ebe31970c125fb18ed9b71112f50
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/plugins/core.py
M ckan/public/base/css/main.css
R ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/main.less
R ckan/public/base/less/popover-context.less
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
A ckan/public/base/vendor/bootstrap/js/.jshintrc
R ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
R ckan/public/base/vendor/bootstrap/js/tests/index.html
R ckan/public/base/vendor/bootstrap/js/tests/phantom.js
R ckan/public/base/vendor/bootstrap/js/tests/server.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
A ckan/public/base/vendor/bootstrap/less/accordion.less
R ckan/public/base/vendor/bootstrap/less/accordion.less
A ckan/public/base/vendor/bootstrap/less/alerts.less
R ckan/public/base/vendor/bootstrap/less/alerts.less
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
R ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
M ckan/public/base/vendor/bootstrap/less/button-groups.less
M ckan/public/base/vendor/bootstrap/less/buttons.less
M ckan/public/base/vendor/bootstrap/less/carousel.less
M ckan/public/base/vendor/bootstrap/less/close.less
A ckan/public/base/vendor/bootstrap/less/code.less
R ckan/public/base/vendor/bootstrap/less/code.less
R ckan/public/base/vendor/bootstrap/less/component-animations.less
A ckan/public/base/vendor/bootstrap/less/component-animations.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/forms.less
A ckan/public/base/vendor/bootstrap/less/grid.less
R ckan/public/base/vendor/bootstrap/less/grid.less
R ckan/public/base/vendor/bootstrap/less/hero-unit.less
A ckan/public/base/vendor/bootstrap/less/hero-unit.less
M ckan/public/base/vendor/bootstrap/less/labels-badges.less
R ckan/public/base/vendor/bootstrap/less/layouts.less
A ckan/public/base/vendor/bootstrap/less/layouts.less
M ckan/public/base/vendor/bootstrap/less/media.less
M ckan/public/base/vendor/bootstrap/less/mixins.less
A ckan/public/base/vendor/bootstrap/less/modals.less
R ckan/public/base/vendor/bootstrap/less/modals.less
M ckan/public/base/vendor/bootstrap/less/navbar.less
M ckan/public/base/vendor/bootstrap/less/navs.less
M ckan/public/base/vendor/bootstrap/less/pager.less
M ckan/public/base/vendor/bootstrap/less/pagination.less
M ckan/public/base/vendor/bootstrap/less/popovers.less
R ckan/public/base/vendor/bootstrap/less/progress-bars.less
A ckan/public/base/vendor/bootstrap/less/progress-bars.less
R ckan/public/base/vendor/bootstrap/less/reset.less
A ckan/public/base/vendor/bootstrap/less/reset.less
R ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
R ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/bootstrap/less/scaffolding.less
M ckan/public/base/vendor/bootstrap/less/sprites.less
M ckan/public/base/vendor/bootstrap/less/tables.less
R ckan/public/base/vendor/bootstrap/less/tests/buttons.html
A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
M ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
R ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
A ckan/public/base/vendor/bootstrap/less/tests/forms.html
R ckan/public/base/vendor/bootstrap/less/tests/forms.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
R ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
R ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
R ckan/public/base/vendor/bootstrap/less/tests/navbar.html
M ckan/public/base/vendor/bootstrap/less/thumbnails.less
M ckan/public/base/vendor/bootstrap/less/tooltip.less
M ckan/public/base/vendor/bootstrap/less/type.less
A ckan/public/base/vendor/bootstrap/less/utilities.less
R ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
A ckan/public/base/vendor/bootstrap/less/wells.less
R ckan/public/base/vendor/bootstrap/less/wells.less
M ckan/public/base/vendor/resource.config
R ckan/templates/ajax_snippets/popover_context_dataset.html
R ckan/templates/ajax_snippets/popover_context_group.html
R ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/footer.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/related/dashboard.html
A ckan/templates/snippets/context.html
A ckan/templates/snippets/context/dataset.html
A ckan/templates/snippets/context/group.html
A ckan/templates/snippets/context/user.html
M ckan/templates/snippets/package_item.html
R ckan/templates/snippets/popover_context.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
M ckanext/reclinepreview/theme/public/preview_recline.js
R ckanext/reclinepreview/theme/public/preview_recline.min.js
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
M doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merged master
Commit: 071798263c99e94ce7d95ae4ec6a0295593a8836
https://github.com/okfn/ckan/commit/071798263c99e94ce7d95ae4ec6a0295593a8836
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/public/base/images/dashboard-followee-related.png
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/layout.less
M ckan/templates/snippets/context.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
[#354] Lot's of tweaks from after #300 merge
Commit: 4ed2976ab8ef6d56e6455f54e38c3293e7ce9008
https://github.com/okfn/ckan/commit/4ed2976ab8ef6d56e6455f54e38c3293e7ce9008
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
R ckan/templates/admin/authz.html
M ckan/templates/admin/base.html
Log Message:
-----------
[#354] Removed ready for master merge
Commit: a23679d8c3b47b099c1919f2991c2a0e0af2d821
https://github.com/okfn/ckan/commit/a23679d8c3b47b099c1919f2991c2a0e0af2d821
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
Merged master
Commit: c6ace53ecd2d74f2a3e47b1c0b7fd96f759838bb
https://github.com/okfn/ckan/commit/c6ace53ecd2d74f2a3e47b1c0b7fd96f759838bb
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/public/base/less/dataset.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
[#354] Adds username to header
Commit: c9f10108d7792ecb7939fffb8997355009c40119
https://github.com/okfn/ckan/commit/c9f10108d7792ecb7939fffb8997355009c40119
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
M ckan/new_authz.py
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
R ckan/tests/functional/test_datastore.py
Log Message:
-----------
Merged master
Commit: 4a93fb7d7cc151c4ff825da14aa1eaffde8095f3
https://github.com/okfn/ckan/commit/4a93fb7d7cc151c4ff825da14aa1eaffde8095f3
Author: John Martin <me at johnmart.in>
Date: 2013-02-21 (Thu, 21 Feb 2013)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#354] Removed uneeded route
Commit: cfec3dc4dea73d2ee9b03dbeda76a13bf618c63f
https://github.com/okfn/ckan/commit/cfec3dc4dea73d2ee9b03dbeda76a13bf618c63f
Author: John Martin <me at johnmart.in>
Date: 2013-02-21 (Thu, 21 Feb 2013)
Changed paths:
M ckan/public/base/less/ckan.less
Log Message:
-----------
[#354] Removed references to delete files
Commit: 37bb5b0e85fe1359fd33ae8bd56b82988d734805
https://github.com/okfn/ckan/commit/37bb5b0e85fe1359fd33ae8bd56b82988d734805
Author: John Martin <me at johnmart.in>
Date: 2013-02-21 (Thu, 21 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/masthead.less
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/group/about.html
M ckan/templates/header.html
M ckan/templates/organization/about.html
R ckan/templates/package/about.html
M ckan/templates/package/read.html
M ckan/templates/package/search.html
M ckan/templates/user/edit_base.html
Log Message:
-----------
[#354] Tweaks from first round of code review
Commit: 2894673c8d957a64e29e78d0e9e6b534e901a2ce
https://github.com/okfn/ckan/commit/2894673c8d957a64e29e78d0e9e6b534e901a2ce
Author: John Martin <me at johnmart.in>
Date: 2013-02-21 (Thu, 21 Feb 2013)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#354] Removed old about dataset route
Commit: 43eea9b693bc91833251c696e737a75e5597a240
https://github.com/okfn/ckan/commit/43eea9b693bc91833251c696e737a75e5597a240
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-21 (Thu, 21 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/lib/cli.py
M ckan/public/base/css/main.css
A ckan/public/base/images/bg.png
M ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/nav-active.png
A ckan/public/base/images/nav.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/less/ckan.less
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/dataset.less
R ckan/public/base/less/follower-list.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
A ckan/public/base/less/homepage.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
A ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/confirm_reset.html
M ckan/templates/admin/index.html
R ckan/templates/admin/snippets/header.html
M ckan/templates/error_document_template.html
M ckan/templates/group/about.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/header.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/organization/about.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
A ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_resource.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_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
R ckan/templates/package/snippets/back_to_package_action.html
M ckan/templates/package/snippets/info.html
A ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/page.html
M ckan/templates/snippets/context.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/social.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
A ckan/templates/user/edit_base.html
M ckan/templates/user/list.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/followers.html
Log Message:
-----------
Merge branch '354-ia-review'
Compare: https://github.com/okfn/ckan/compare/41a6c5b43489...43eea9b693bc
More information about the ckan-changes
mailing list