[ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files
GitHub
noreply at github.com
Wed Feb 20 17:16:54 UTC 2013
Branch: refs/heads/278-bulk-updates
Home: https://github.com/okfn/ckan
Commit: 604229bb905a51f6f5fc41f4f07706f6d10bc3a4
https://github.com/okfn/ckan/commit/604229bb905a51f6f5fc41f4f07706f6d10bc3a4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Patch to compile less when minifying files
Commit: 9c8336731798c10a4196bb48d64986a00d3d71bb
https://github.com/okfn/ckan/commit/9c8336731798c10a4196bb48d64986a00d3d71bb
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
A ckan/public/base/less/font-awesome.less
M ckan/public/base/less/icons.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
Log Message:
-----------
[#300] - Updated the font awesome library to 3.0.2
Commit: 718a9ec4e5d469d71e1bf8892393afe6d25844b2
https://github.com/okfn/ckan/commit/718a9ec4e5d469d71e1bf8892393afe6d25844b2
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/base/less/activity.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/toolbar.less
M ckan/public/base/less/variables.less
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/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/home_breadcrumb_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
[#300] Loads of minor CSS and HTML tweaks from upgrading font awesome
Commit: d5e054df170f0d550919c159eacf9ff705728865
https://github.com/okfn/ckan/commit/d5e054df170f0d550919c159eacf9ff705728865
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
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
A ckan/public/base/vendor/bootstrap/js1/bootstrap-alert.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-alert.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-button.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-button.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-collapse.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-collapse.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-dropdown.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-modal.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-modal.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-popover.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-tab.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-tab.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-tooltip.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-tooltip.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-transition.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-transition.min.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-typeahead.js
A ckan/public/base/vendor/bootstrap/js1/bootstrap-typeahead.min.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
A ckan/public/base/vendor/bootstrap/less1/accordion.less
A ckan/public/base/vendor/bootstrap/less1/alerts.less
A ckan/public/base/vendor/bootstrap/less1/bootstrap.less
A ckan/public/base/vendor/bootstrap/less1/breadcrumbs.less
A ckan/public/base/vendor/bootstrap/less1/button-groups.less
A ckan/public/base/vendor/bootstrap/less1/buttons.less
A ckan/public/base/vendor/bootstrap/less1/carousel.less
A ckan/public/base/vendor/bootstrap/less1/close.less
A ckan/public/base/vendor/bootstrap/less1/code.less
A ckan/public/base/vendor/bootstrap/less1/component-animations.less
A ckan/public/base/vendor/bootstrap/less1/dropdowns.less
A ckan/public/base/vendor/bootstrap/less1/forms.less
A ckan/public/base/vendor/bootstrap/less1/grid.less
A ckan/public/base/vendor/bootstrap/less1/hero-unit.less
A ckan/public/base/vendor/bootstrap/less1/labels-badges.less
A ckan/public/base/vendor/bootstrap/less1/layouts.less
A ckan/public/base/vendor/bootstrap/less1/mixins.less
A ckan/public/base/vendor/bootstrap/less1/modals.less
A ckan/public/base/vendor/bootstrap/less1/navbar.less
A ckan/public/base/vendor/bootstrap/less1/navs.less
A ckan/public/base/vendor/bootstrap/less1/pager.less
A ckan/public/base/vendor/bootstrap/less1/pagination.less
A ckan/public/base/vendor/bootstrap/less1/popovers.less
A ckan/public/base/vendor/bootstrap/less1/progress-bars.less
A ckan/public/base/vendor/bootstrap/less1/reset.less
A ckan/public/base/vendor/bootstrap/less1/responsive-1200px-min.less
A ckan/public/base/vendor/bootstrap/less1/responsive-767px-max.less
A ckan/public/base/vendor/bootstrap/less1/responsive-768px-979px.less
A ckan/public/base/vendor/bootstrap/less1/responsive-navbar.less
A ckan/public/base/vendor/bootstrap/less1/responsive-utilities.less
A ckan/public/base/vendor/bootstrap/less1/responsive.less
A ckan/public/base/vendor/bootstrap/less1/scaffolding.less
A ckan/public/base/vendor/bootstrap/less1/sprites.less
A ckan/public/base/vendor/bootstrap/less1/tables.less
A ckan/public/base/vendor/bootstrap/less1/thumbnails.less
A ckan/public/base/vendor/bootstrap/less1/tooltip.less
A ckan/public/base/vendor/bootstrap/less1/type.less
A ckan/public/base/vendor/bootstrap/less1/utilities.less
A ckan/public/base/vendor/bootstrap/less1/variables.less
A ckan/public/base/vendor/bootstrap/less1/wells.less
Log Message:
-----------
[#300] Upgraded bootstrap to 2.2.2
Commit: 61c87e4a88a743f007644339783d6b47488685e6
https://github.com/okfn/ckan/commit/61c87e4a88a743f007644339783d6b47488685e6
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
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/toolbar.less
M ckan/public/base/less/variables.less
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/snippets/group_item.html
Log Message:
-----------
[#300] Loads of minor tweaks for templates and CSS since bootstrap upgrade
Commit: cab606bee8822c45f00e1e76b5bfb21fb875ec5f
https://github.com/okfn/ckan/commit/cab606bee8822c45f00e1e76b5bfb21fb875ec5f
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
R ckan/public/base/vendor/bootstrap/js1/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-alert.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-button.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-collapse.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-dropdown.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-modal.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-popover.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-tab.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-tooltip.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-transition.min.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js1/bootstrap-typeahead.min.js
R ckan/public/base/vendor/bootstrap/less1/accordion.less
R ckan/public/base/vendor/bootstrap/less1/alerts.less
R ckan/public/base/vendor/bootstrap/less1/bootstrap.less
R ckan/public/base/vendor/bootstrap/less1/breadcrumbs.less
R ckan/public/base/vendor/bootstrap/less1/button-groups.less
R ckan/public/base/vendor/bootstrap/less1/buttons.less
R ckan/public/base/vendor/bootstrap/less1/carousel.less
R ckan/public/base/vendor/bootstrap/less1/close.less
R ckan/public/base/vendor/bootstrap/less1/code.less
R ckan/public/base/vendor/bootstrap/less1/component-animations.less
R ckan/public/base/vendor/bootstrap/less1/dropdowns.less
R ckan/public/base/vendor/bootstrap/less1/forms.less
R ckan/public/base/vendor/bootstrap/less1/grid.less
R ckan/public/base/vendor/bootstrap/less1/hero-unit.less
R ckan/public/base/vendor/bootstrap/less1/labels-badges.less
R ckan/public/base/vendor/bootstrap/less1/layouts.less
R ckan/public/base/vendor/bootstrap/less1/mixins.less
R ckan/public/base/vendor/bootstrap/less1/modals.less
R ckan/public/base/vendor/bootstrap/less1/navbar.less
R ckan/public/base/vendor/bootstrap/less1/navs.less
R ckan/public/base/vendor/bootstrap/less1/pager.less
R ckan/public/base/vendor/bootstrap/less1/pagination.less
R ckan/public/base/vendor/bootstrap/less1/popovers.less
R ckan/public/base/vendor/bootstrap/less1/progress-bars.less
R ckan/public/base/vendor/bootstrap/less1/reset.less
R ckan/public/base/vendor/bootstrap/less1/responsive-1200px-min.less
R ckan/public/base/vendor/bootstrap/less1/responsive-767px-max.less
R ckan/public/base/vendor/bootstrap/less1/responsive-768px-979px.less
R ckan/public/base/vendor/bootstrap/less1/responsive-navbar.less
R ckan/public/base/vendor/bootstrap/less1/responsive-utilities.less
R ckan/public/base/vendor/bootstrap/less1/responsive.less
R ckan/public/base/vendor/bootstrap/less1/scaffolding.less
R ckan/public/base/vendor/bootstrap/less1/sprites.less
R ckan/public/base/vendor/bootstrap/less1/tables.less
R ckan/public/base/vendor/bootstrap/less1/thumbnails.less
R ckan/public/base/vendor/bootstrap/less1/tooltip.less
R ckan/public/base/vendor/bootstrap/less1/type.less
R ckan/public/base/vendor/bootstrap/less1/utilities.less
R ckan/public/base/vendor/bootstrap/less1/variables.less
R ckan/public/base/vendor/bootstrap/less1/wells.less
Log Message:
-----------
[#300] Removed old bootstrap files
Commit: a3d640530055fb93797298e8807ca3fa3455a63f
https://github.com/okfn/ckan/commit/a3d640530055fb93797298e8807ca3fa3455a63f
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/less/footer.less
Log Message:
-----------
[#300] Updated logos to the latest versions
Commit: 1596e3ad9a8b767b5b7ea35f9f7b9c6823095e91
https://github.com/okfn/ckan/commit/1596e3ad9a8b767b5b7ea35f9f7b9c6823095e91
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/profile.less
M ckan/templates/snippets/activity_item.html
Log Message:
-----------
[#300] Tweaks to the popover code after bootstrap upgrade
Commit: f2cbb8fe7acd4ce4997d5f67294c21e130c67229
https://github.com/okfn/ckan/commit/f2cbb8fe7acd4ce4997d5f67294c21e130c67229
Author: John Martin <me at johnmart.in>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/dataset.less
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
Merge branch 'master' into 300-frontend-dependancies
Commit: 045da9682d5c75beb900b690d26e5cae82fceb4d
https://github.com/okfn/ckan/commit/045da9682d5c75beb900b690d26e5cae82fceb4d
Author: John Martin <me at johnmart.in>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M ckan/public/base/less/activity.less
Log Message:
-----------
[#300] Search replace == bad
Commit: 27284e3bae4a527efedf3a35b94e5509f13fe2c4
https://github.com/okfn/ckan/commit/27284e3bae4a527efedf3a35b94e5509f13fe2c4
Author: John Martin <me at johnmart.in>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#300] Re-build of production main.css
Commit: 94ab36df1b51700e0ce0128d381828cd30ff5ec0
https://github.com/okfn/ckan/commit/94ab36df1b51700e0ce0128d381828cd30ff5ec0
Author: John Martin <me at johnmart.in>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/macros/form.html
Log Message:
-----------
[#300] Tweaks to the form macros as <input> tags require 'type=text' for the new bootstrap
Commit: e97a5216b349457690bb46094d919587e702572d
https://github.com/okfn/ckan/commit/e97a5216b349457690bb46094d919587e702572d
Author: John Martin <me at johnmart.in>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#300] Re-build of production main.css
Commit: 26c6c6a51f9e524a8a7beab8284e95f64fce60ba
https://github.com/okfn/ckan/commit/26c6c6a51f9e524a8a7beab8284e95f64fce60ba
Author: John Martin <me at johnmart.in>
Date: 2013-02-12 (Tue, 12 Feb 2013)
Changed paths:
M .gitignore
M README.rst
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/revision.py
M ckan/controllers/user.py
M ckan/lib/activity_streams_session_extension.py
M ckan/lib/base.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/schema.py
M ckan/model/__init__.py
M ckan/model/meta.py
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/templates/admin/authz.html
M ckan/templates/ajax_snippets/api_info.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/templates/user/read_base.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_tag.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/reclinepreview/theme/public/preview_recline.js
M doc/install-from-source.rst
Log Message:
-----------
Mergefix for main.css in master
Commit: bb089f316cdab11f24cf94dc0750f7fd8d9422d4
https://github.com/okfn/ckan/commit/bb089f316cdab11f24cf94dc0750f7fd8d9422d4
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M .gitignore
A .travis.yml
A CONTRIBUTING.rst
M README.rst
M ckan/__init__.py
R ckan/authz.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
R ckan/controllers/group_formalchemy.py
M ckan/controllers/home.py
A ckan/controllers/organization.py
M ckan/controllers/package.py
R ckan/controllers/package_formalchemy.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/activity_streams_session_extension.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
A ckan/lib/datapreview.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
A ckan/lib/email_notifications.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/mailer.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/063_org_changes.py
A ckan/migration/versions/064_add_email_last_sent_column.py
A ckan/migration/versions/065_add_email_notifications_preference.py
A ckan/migration/versions/066_default_package_type.py
M ckan/model/__init__.py
M ckan/model/activity.py
M ckan/model/authz.py
M ckan/model/dashboard.py
M ckan/model/group.py
M ckan/model/meta.py
M ckan/model/package.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
R ckan/public/base/datapreview/css/json.css
R ckan/public/base/datapreview/css/json.min.css
R ckan/public/base/datapreview/css/pdf.css
R ckan/public/base/datapreview/css/pdf.min.css
R ckan/public/base/datapreview/css/recline.css
R ckan/public/base/datapreview/css/recline.min.css
R ckan/public/base/datapreview/img/ajaxload-circle.gif
R ckan/public/base/datapreview/preview_json.js
R ckan/public/base/datapreview/preview_json.min.js
R ckan/public/base/datapreview/preview_pdf.js
R ckan/public/base/datapreview/preview_pdf.min.js
R ckan/public/base/datapreview/preview_recline.js
R ckan/public/base/datapreview/preview_recline.min.js
R ckan/public/base/datapreview/resource.config
R ckan/public/base/datapreview/vendor/backbone/backbone.js
R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
R ckan/public/base/datapreview/vendor/moment/moment.js
R ckan/public/base/datapreview/vendor/moment/moment.min.js
R ckan/public/base/datapreview/vendor/mustache/mustache.js
R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
R ckan/public/base/datapreview/vendor/recline/css/recline.css
R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
R ckan/public/base/datapreview/vendor/recline/recline.js
R ckan/public/base/datapreview/vendor/recline/recline.min.js
R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
R ckan/public/base/datapreview/vendor/slickgrid/README.txt
R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
R ckan/public/base/datapreview/vendor/underscore/underscore.js
R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
R ckan/public/base/datapreview/vendor/webL10n/README.md
R ckan/public/base/datapreview/vendor/webL10n/l10n.js
R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
A ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/editing.png
A ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/images/placeholder-group.png
A ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/modules/dashboard.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/dataset.less
A ckan/public/base/less/dropdown.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
R ckan/public/base/less/popover-context.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/public/base/vendor/resource.config
A ckan/templates/activity_streams/activity_stream_email_notifications.text
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/authz.html
M ckan/templates/ajax_snippets/api_info.html
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/base.html
R ckan/templates/dataviewer/json.html
R ckan/templates/dataviewer/pdf.html
R ckan/templates/dataviewer/recline.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/footer.html
M ckan/templates/group/base_form_page.html
A ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/index.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
A ckan/templates/organization/index.html
A ckan/templates/organization/member_new.html
A ckan/templates/organization/members.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/info.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
A ckan/templates/package/activity.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/page.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/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/package_item.html
A ckan/templates/snippets/page_header.html
A ckan/templates/snippets/private.html
M ckan/templates/snippets/related.html
A ckan/templates/tests/mock_json_resource_preview_template.html
A ckan/templates/tests/mock_resource_preview_template.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
A ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/__init__.py
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_tag.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
A ckan/tests/functional/api/test_email_notifications.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
R ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_pagination.py
A ckan/tests/functional/test_preview_interface.py
R ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
R ckan/tests/lib/test_authztool.py
A ckan/tests/lib/test_datapreview.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
A ckan/tests/lib/test_email_notifications.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_tag.py
R ckan/tests/misc/test_auth_profiles.py
M ckan/tests/misc/test_mock_mail_server.py
R ckan/tests/misc/test_package_saver.py
M ckan/tests/mock_mail_server.py
M ckan/tests/mock_publisher_auth.py
R ckan/tests/models/test_authz.py
M ckan/tests/models/test_group.py
R ckan/tests/models/test_repo.py
R ckan/tests/test_authz.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/datastore/bin/datastore_setup.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
A ckanext/jsonpreview/__init__.py
A ckanext/jsonpreview/plugin.py
A ckanext/jsonpreview/tests/__init__.py
A ckanext/jsonpreview/tests/test_preview.py
A ckanext/jsonpreview/theme/public/css/json.css
A ckanext/jsonpreview/theme/public/css/json.min.css
A ckanext/jsonpreview/theme/public/preview_json.js
A ckanext/jsonpreview/theme/public/preview_json.min.js
A ckanext/jsonpreview/theme/public/resource.config
A ckanext/jsonpreview/theme/templates/json.html
M ckanext/multilingual/solr/schema.xml
A ckanext/pdfpreview/__init__.py
A ckanext/pdfpreview/plugin.py
A ckanext/pdfpreview/tests/__init__.py
A ckanext/pdfpreview/tests/test_preview.py
A ckanext/pdfpreview/theme/public/css/pdf.css
A ckanext/pdfpreview/theme/public/css/pdf.min.css
A ckanext/pdfpreview/theme/public/css/recline.css
A ckanext/pdfpreview/theme/public/css/recline.min.css
A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
A ckanext/pdfpreview/theme/public/preview_pdf.js
A ckanext/pdfpreview/theme/public/preview_pdf.min.js
A ckanext/pdfpreview/theme/public/resource.config
A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
A ckanext/pdfpreview/theme/templates/pdf.html
A ckanext/reclinepreview/__init__.py
A ckanext/reclinepreview/plugin.py
A ckanext/reclinepreview/tests/__init__.py
A ckanext/reclinepreview/tests/test_preview.py
A ckanext/reclinepreview/theme/public/css/recline.css
A ckanext/reclinepreview/theme/public/css/recline.min.css
A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
A ckanext/reclinepreview/theme/public/preview_recline.js
A ckanext/reclinepreview/theme/public/resource.config
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.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.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.css
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.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.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
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
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.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
A 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/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-src.min.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.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
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.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.js
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.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.js
A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.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-ui-1.8.16.custom.min.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/jquery.event.drag-2.0.min.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
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.css
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.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/timeline/20120520/js/timeline.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.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.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
A ckanext/reclinepreview/theme/templates/recline.html
A ckanext/resourceproxy/__init__.py
A ckanext/resourceproxy/controller.py
A ckanext/resourceproxy/plugin.py
A ckanext/resourceproxy/tests/__init__.py
A ckanext/resourceproxy/tests/file_server.py
A ckanext/resourceproxy/tests/static/huge.json
A ckanext/resourceproxy/tests/static/test.json
A ckanext/resourceproxy/tests/test_proxy.py
M ckanext/test_tag_vocab_plugin.py
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
M doc/configuration.rst
A doc/css-coding-standards.rst
M doc/datastore-api.rst
M doc/datastore-setup.rst
M doc/datastore.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/email-notifications.rst
A doc/frontend-testing.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/organizations_and_groups.rst
A doc/python-coding-standards.rst
M doc/solr-setup.rst
M doc/test.rst
M doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into compile-less-via-paster
Commit: 63a4a5081c8782ca0b439688d0e36b825f89409b
https://github.com/okfn/ckan/commit/63a4a5081c8782ca0b439688d0e36b825f89409b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/lib/cli.py
M setup.py
Log Message:
-----------
Add front-end-build paste command
Commit: 9257d8838c348063c4f54e67324bb4e601d988cd
https://github.com/okfn/ckan/commit/9257d8838c348063c4f54e67324bb4e601d988cd
Author: John Martin <me at johnmart.in>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/cli.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/plugins/core.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/data-viewer.js
M ckan/public/base/javascript/modules/popover-context.js
R ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
R ckan/public/base/less/popover-context.less
M ckan/public/base/vendor/resource.config
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/ajax_snippets/api_info.html
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/dataviewer/snippets/data_preview.html
M ckan/templates/home/index.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/user/dashboard.html
A ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/lib/test_dictization.py
M ckanext/reclinepreview/theme/public/preview_recline.js
R ckanext/reclinepreview/theme/public/preview_recline.min.js
M ckanext/reclinepreview/theme/public/resource.config
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.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/bootstrap.min.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-responsive.min.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.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/excanvas.min.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.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
M 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/jquery/1.7.1/jquery.min.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
M 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-src.min.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.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
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
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
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.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
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.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
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
M 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/showdown/20120615/showdown.min.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-ui-1.8.16.custom.min.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/jquery.event.drag-2.0.min.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
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
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.min.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/timeline/20120520/js/timeline.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.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.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.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/writing-extensions.rst
M test-core.ini
Log Message:
-----------
Merged master
Commit: 509dd9452c86e1a5d1077737da0b737914fd4797
https://github.com/okfn/ckan/commit/509dd9452c86e1a5d1077737da0b737914fd4797
Author: John Martin <me at johnmart.in>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
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
A ckan/public/base/vendor/bootstrap/js/.jshintrc
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/tests/index.html
A ckan/public/base/vendor/bootstrap/js/tests/index.html
R ckan/public/base/vendor/bootstrap/js/tests/phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/phantom.js
R ckan/public/base/vendor/bootstrap/js/tests/server.js
A ckan/public/base/vendor/bootstrap/js/tests/server.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.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
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
M ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.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
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.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
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
M ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
M ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
M ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
R ckan/public/base/vendor/bootstrap/less/accordion.less
A 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
A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
R 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
A ckan/public/base/vendor/bootstrap/less/layouts.less
R 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
R ckan/public/base/vendor/bootstrap/less/modals.less
A 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
A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
R ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
R ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
A 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
R 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
R ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
A 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
R ckan/public/base/vendor/bootstrap/less/tests/navbar.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
R ckan/public/base/vendor/bootstrap/less/utilities.less
A ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
R ckan/public/base/vendor/bootstrap/less/wells.less
A ckan/public/base/vendor/bootstrap/less/wells.less
Log Message:
-----------
[#300] Upgraded bootstrap to 2.3.0
Commit: 4a067ff87ca893d709cdb93d21cb88df78222d7f
https://github.com/okfn/ckan/commit/4a067ff87ca893d709cdb93d21cb88df78222d7f
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Improve docsting for paster less
Commit: 4582d4380eb2b2cdec6c92430a09bf2c16151f5e
https://github.com/okfn/ckan/commit/4582d4380eb2b2cdec6c92430a09bf2c16151f5e
Author: John Martin <me at johnmart.in>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/lib/app_globals.py
M ckan/public/base/css/main.css
M ckan/public/base/less/dataset.less
M ckan/templates/footer.html
M ckan/templates/package/read.html
M ckan/templates/snippets/package_item.html
Log Message:
-----------
Merged master
Commit: 2e8f7f9ddcbad4164b9daf099db0b21353267920
https://github.com/okfn/ckan/commit/2e8f7f9ddcbad4164b9daf099db0b21353267920
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
[#402] Fix password visibility
Commit: 5809fa061ebbdf6102e39f58badfabe1405203c3
https://github.com/okfn/ckan/commit/5809fa061ebbdf6102e39f58badfabe1405203c3
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#409] Remove authz admin functionality from controller
Commit: 313b1b3794d9d8bac0c7753b27fb444f30fdd89a
https://github.com/okfn/ckan/commit/313b1b3794d9d8bac0c7753b27fb444f30fdd89a
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
R ckan/templates/admin/authz.html
Log Message:
-----------
[#409] Remove authz admin template
Commit: f2ff8ca9d236c67ac1dd95bbb2cfae97ce86878c
https://github.com/okfn/ckan/commit/f2ff8ca9d236c67ac1dd95bbb2cfae97ce86878c
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
[#409] Remove authz admin from menu
Commit: 61aacc8f106b13e65f48a1759e9aded019359555
https://github.com/okfn/ckan/commit/61aacc8f106b13e65f48a1759e9aded019359555
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/controllers/datastore.py
R ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#362][s]: remove controller, routing and test code related to old (ES) datastore.
Note, have not removed (and will not remove) references to old datastore in:
* templates_legacy (assume these will get removed anyway)
* i18n (assume this will get rebuilt prior to release)
Commit: 27361b88e1b8fe2167f83bd9cb5cf70e953ce052
https://github.com/okfn/ckan/commit/27361b88e1b8fe2167f83bd9cb5cf70e953ce052
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/package.py
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362,bugfix][s]: remove remaining reference to routing for old datastore (by removing api_data method in package controller).
The ultimate change was reasonably substantial - removal of an entire method on
a controller and associated template. It began simply with the need to
remove/update reference this routing call in api_data method on package
controller
url = h.url_for('datastore_read', id=id, qualified=True)
I spent about half an hour trying to understand if this method was used at all.
I ultimately determined that we had a setup where clicking on the Data API
button in the resource view had 2 possible effect routes:
* Via href={url} => package.py/api_data method =>
template/package/resource_api_data.html =>
template/ajax_snippets/api_info.html
* Via JS intercept of click => api/snippets controller =>
template/ajax_snippets/api_info.html
But there was a subtle difference: the first route (which is *not* normally
followed since JS is usally enabled) still uses the old datastore URL (this is
why I'd started this investigation!).
(Aside: this was hard to debug through the interface as JS is enabled and I
note we do not have resource view tests so the non AJAX route is not tested).
I first tried to correct this by setting the URL to the correct datastore API
but then discovered other parameters were missing - it seems the signature of
the call to ajax_snippets template has changed but that the relevant code in
package/resource_data_api.html has not been updated:
{% snippet 'ajax_snippets/api_info.html', datastore_root_url=datastore_root_url, embedded=true %}
Rather than continue fixing I decided at this point to remove this non-AJAX
fallback code in its entirety.
Comment: this was a subtle bug that has crept in because there are now 2 ways to do
something and one of these routes (the non-AJAX route) is almost never used ...
I wonder whether it is necessary always to have both options (AJAX and
non-AJAX) as it likely to multiply code complexity and, hence, these sort of bugs.
Commit: e8eb4ad76b0d016d5d8c6431098376fc33507504
https://github.com/okfn/ckan/commit/e8eb4ad76b0d016d5d8c6431098376fc33507504
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix api info for non-js browsing
Commit: 0fe757949f244ab935e49c619f2603e16659e29b
https://github.com/okfn/ckan/commit/0fe757949f244ab935e49c619f2603e16659e29b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix broken test code
Commit: 922bb479ebd9211ad75c5b37cf2332a518bf81cb
https://github.com/okfn/ckan/commit/922bb479ebd9211ad75c5b37cf2332a518bf81cb
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
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
M ckan/public/base/vendor/resource.config
Log Message:
-----------
[#300] Moved from seperate bootstrap js files for one main file
Commit: a0127f8a4618699327c1910bd5bd7cfa50275c5e
https://github.com/okfn/ckan/commit/a0127f8a4618699327c1910bd5bd7cfa50275c5e
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/public/base/less/dashboard.less
Log Message:
-----------
[#300] Tweak to main dashboard column width
Commit: d51a78a60a5dc8783944e59fa7cbdea74b84566d
https://github.com/okfn/ckan/commit/d51a78a60a5dc8783944e59fa7cbdea74b84566d
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Recompile css after merging 300 branch
Commit: cb8656bb567695b2b542984433e2e7312ca91816
https://github.com/okfn/ckan/commit/cb8656bb567695b2b542984433e2e7312ca91816
Author: Ross Jones <rossdjones at gmail.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/templates/package/read_base.html
Log Message:
-----------
Adds an alternate link to RDF rendering of metadata
Commit: 9ab8663a9b4569d643fc74a727483ed663c84e7e
https://github.com/okfn/ckan/commit/9ab8663a9b4569d643fc74a727483ed663c84e7e
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/templates/package/read_base.html
Log Message:
-----------
[#413] Use id not name for rdf link
Commit: 1abef578fe7cc89f5c80cc1e0df7ecd2f06dd7b1
https://github.com/okfn/ckan/commit/1abef578fe7cc89f5c80cc1e0df7ecd2f06dd7b1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add 'state' to db_to_form_package_schema
Fixes #370
Commit: 51707384b13eaf7c34d32857e8b4a1252f6b6dab
https://github.com/okfn/ckan/commit/51707384b13eaf7c34d32857e8b4a1252f6b6dab
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add isopen, license_url, license_title to db_to_form_package_schema
Fixes #375
Commit: 844f245aed8ded90846f79af2f2efee526c8563f
https://github.com/okfn/ckan/commit/844f245aed8ded90846f79af2f2efee526c8563f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add group description to db_to_form_package_schema
Fixes #372
Commit: deebae7f1492cb04b25051f5d262006c5ac8ff89
https://github.com/okfn/ckan/commit/deebae7f1492cb04b25051f5d262006c5ac8ff89
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add default_tags_schema to form_to_db_package_schema
This fixes lots of "input field __junk was not expected" when running
the ckan tests with an IDatasetForm plugin active (and hence the
form_to_db package validation active).
Commit: 0bde2f196cbad22e06609cdd752fe250c3ff6f04
https://github.com/okfn/ckan/commit/0bde2f196cbad22e06609cdd752fe250c3ff6f04
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Don't put api version in context when creating datasets in web ui
The form_to_db_schema() methods of IDatasetForm plugins were not getting
called when creating datasets in the web interface, if the IDatasetForm
plugin inherits from DefaultDatasetForm.
The reason was that DefaultDatasetForm's form_to_db_schema() method
deliberately doesn't call the method if the dataset is being created via
the API, and the package controller's new_resources() and new_metadata()
methods (for the new three-stage dataset creation) put the API version
in the context, so DefaultDatasetForm thinks it's being used over the
API.
Change the package controller to not put the API version in the context.
Fixes #390.
Commit: ef2ac5ed8df4759d36ff372e8fdf2cc4af845cad
https://github.com/okfn/ckan/commit/ef2ac5ed8df4759d36ff372e8fdf2cc4af845cad
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Fix DefaultDatasetForm's check_data_dict()
Some recent commits (I think maybe ec8f69c and b6ccfca) caused
DefaultDatasetForm's check_data_dict() method to start raising Integrity
Error when creating a dataset using the web ui. Make check_data_dict() a
bit more liberal so it doesn't raise these errors anymore.
Commit: e4518c232934cb6952ebf75d1bae62f6a4b18f87
https://github.com/okfn/ckan/commit/e4518c232934cb6952ebf75d1bae62f6a4b18f87
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
Update a couple of tests broken by commit 0f7d6a2
These tests relied on DefaultDatasetForm's check_data_dict throwing an
error, but since commit 0f7d6a2 made check_data_dict more liberal it
wasn't throwing the error anymore, tweak the tests to submit forms that
check_data_dict will still throw an error for.
Commit: 34d71b5e56db24206d2d04bacddf11bc1966db1d
https://github.com/okfn/ckan/commit/34d71b5e56db24206d2d04bacddf11bc1966db1d
Author: Ian Ward <ian at excess.org>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
default to not-broken navl validation
But, frankly all of pull request #2671 is suspect
Commit: dbf2bcce346be5ef20ea45bce7fa9bbbc4901659
https://github.com/okfn/ckan/commit/dbf2bcce346be5ef20ea45bce7fa9bbbc4901659
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Don't strip id's from extras in validate()
db_to_form_package_schema() (which is only used if an IDatasetForm
plugin is active) was stripping the "id" keys from package extras, which
then causes some tests to fail. Not sure if just the tests were
crashing, or if some ckan pages were also crashing. Anyway, this commit
means they don't get stripped anymore.
Fixes #406
Commit: 5cd0401e13bad2c2a3a279b13d141fc524191ac4
https://github.com/okfn/ckan/commit/5cd0401e13bad2c2a3a279b13d141fc524191ac4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Revert "[#406] Don't strip id's from extras in validate()"
This reverts commit ecfacbbc41d85bc4a83bd3ac008f185ec31b9185.
It's fine to strip IDs from extras, extra IDs are never useful or needed
by users. Any tests that are failing (or templates that are crashing,
etc.) by trying to read extra IDs should be fixed to not read extra IDs.
Commit: 4a1212df555779f323481e5f840399ddbdb5c437
https://github.com/okfn/ckan/commit/4a1212df555779f323481e5f840399ddbdb5c437
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Fix some broken tests
These tests were failing when run with an IDatasetForm plugin active
because they're trying to read extra IDs, which they shouldn't do.
Change the tests to not read extra IDs, now they pass.
See commits ecfacbbc4 and e6acbd4bc645.
Commit: d9ffebd25897a1b380626d3519cfe8182c403850
https://github.com/okfn/ckan/commit/d9ffebd25897a1b380626d3519cfe8182c403850
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
db_to_form_package_schema don't strip keys
Add empty lists to db_to_form_package_schema() for several keys that
normally appear in dicts from package_show, but that were being stripped
from thos dicts when db_to_form_package_schema() was used (i.e. when an
IDatasetForm plugin was active). Fixes #407.
Commit: 2cb4bda3ec7eb58a4b2191557ca8658c77e87583
https://github.com/okfn/ckan/commit/2cb4bda3ec7eb58a4b2191557ca8658c77e87583
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
db_to_form_package_schema() don't strip keys from resource dicts
Add several keys to the 'resources' subschema in
db_to_form_package_schema() so that validation doesn't strip the keys
from the resources dicts. This fixes a test that was failing if run with
an IDatasetForm plugin active, and may also fix some template crashes
when an IDatasetForm plugin is active if people are accessing these
resource keys in their templates.
Fixes #415.
Commit: df1209c706748c65077144dff5c762dc86b6b63e
https://github.com/okfn/ckan/commit/df1209c706748c65077144dff5c762dc86b6b63e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Remove free_tags_only from db_to_form_package_schema()
Remove the free_tags_only converter from db_to_form_package_schema's
tags subschema.
This fixes a couple of tag vocabularies tests that were failing.
Not sure if this at the same time breaks something that we don't have
tests for, we may have to put this back in later if we find a problem.
Commit: be6058b3044043a15532dbfec910612439f9e2fc
https://github.com/okfn/ckan/commit/be6058b3044043a15532dbfec910612439f9e2fc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Delete some unhelpful comments
Not clear what these comments mean or whether it's still true.
Commit: bb5c4dc721d87533a01563b7e2798028c343916b
https://github.com/okfn/ckan/commit/bb5c4dc721d87533a01563b7e2798028c343916b
Author: Ian Ward <ian at excess.org>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
navl.validate: unflatten before restoring empty lists
Commit: 4d24f0e94667d458584545d16b5fcf31b11956f7
https://github.com/okfn/ckan/commit/4d24f0e94667d458584545d16b5fcf31b11956f7
Author: Ian Ward <ian at excess.org>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
navl.validate: fix key names in restored empty lists
Commit: 18ac4f9d14525d0d983b185b9f406080b33b23b5
https://github.com/okfn/ckan/commit/18ac4f9d14525d0d983b185b9f406080b33b23b5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add license_title back to db_to_form_package_schema()
Looks like this got removed by accident, so license titles weren't
showing on dataset pages.
Commit: 77663865a35a3ac25a20923eb77a5c2538b4380b
https://github.com/okfn/ckan/commit/77663865a35a3ac25a20923eb77a5c2538b4380b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Revert "Remove free_tags_only from db_to_form_package_schema()"
This reverts commit aaa10bbff6e4c704e58f651f13b5b18cfa0a2571.
The free_tags_only converter is needed after all, because it prevents
vocab tags from appearing as normal tags on the dataset read and search
pages.
Reverting aaa10bbf means that a couple of tests are failing, but I think
it's the tests that are wrong not the code.
Commit: 9a15bd5b30b0f29778c4260f9c5929f4d96bddad
https://github.com/okfn/ckan/commit/9a15bd5b30b0f29778c4260f9c5929f4d96bddad
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Don't pass api version to form_to_db_schema_options()
Fixes #417.
Commit: 5f2341b53976b35c4ee27228636582426a6bd2f5
https://github.com/okfn/ckan/commit/5f2341b53976b35c4ee27228636582426a6bd2f5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Revert "[#417] Don't pass api version to form_to_db_schema_options()"
This reverts commit e023d8a5f50baf3931e2610eaa433b5653227154.
e023d8a5 was the wrong fix and broke a bunch of tests, package_update()
was only passing 'api': True if it was in fact called via the api, which
is what it should do.
The real bug is in the package controller's _save_edit() method, which
puts the api version in the context even though it's a web ui method not
an api method. I'll fix that in the next commit...
Commit: a671c38de754b91a85aeb5b74c7b11fd90dd0b30
https://github.com/okfn/ckan/commit/a671c38de754b91a85aeb5b74c7b11fd90dd0b30
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Package controller: Don't put api version in context on package update
Don't put 'api_version' in the request context when calling
package_update() from the package controller, it makes package_update()
think it's being called by the api when in fact it's being called by the
web ui, and that then breaks IDatasetForm.
Commit: 429601cd623ab4141778f85fd3b4cc30a5ca1d78
https://github.com/okfn/ckan/commit/429601cd623ab4141778f85fd3b4cc30a5ca1d78
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Add some more surplus keys to DefaultDatasetForm
Add some more surplus keys to DefaultDatasetForm's check_data_dict(),
this fixes a crash when updating a package over the web ui when an
IDatasetForm plugin is active.
Commit: 4f7b9a00cfe4e3eb3dc9c6d8b76b2602f9447ddc
https://github.com/okfn/ckan/commit/4f7b9a00cfe4e3eb3dc9c6d8b76b2602f9447ddc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
Update a couple of tests broken by commit e023d8a
Commit: b022dda07e2a46995141acf805073706890197fd
https://github.com/okfn/ckan/commit/b022dda07e2a46995141acf805073706890197fd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add a comment
Commit: acc65c5bf7182776ee81494465d5af58fa0a5a13
https://github.com/okfn/ckan/commit/acc65c5bf7182776ee81494465d5af58fa0a5a13
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Delete a commented-out line
Commit: 26c75e5e93a449db075ec7ee8f615eb8138aa8a3
https://github.com/okfn/ckan/commit/26c75e5e93a449db075ec7ee8f615eb8138aa8a3
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/cli.py
M setup.py
Log Message:
-----------
Merge pull request #176 from okfn/compile-less-via-paster
Patch to compile less when minifying files - updated logic
Commit: 90a6ef2f170ae6ca9720955fb48ab8491a4bb5d7
https://github.com/okfn/ckan/commit/90a6ef2f170ae6ca9720955fb48ab8491a4bb5d7
Author: John Martin <me at johnmart.in>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge pull request #402 from okfn/402-password-in-clear
New password not hidden when changing password
Commit: de894c0ea8e1c5ad0a23b7150760296bd57c15a1
https://github.com/okfn/ckan/commit/de894c0ea8e1c5ad0a23b7150760296bd57c15a1
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix datastore active check and misleading message
Commit: 5aab872c4925d807ad549c3e36af585e2ce73c54
https://github.com/okfn/ckan/commit/5aab872c4925d807ad549c3e36af585e2ce73c54
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
Merge pull request #409 from okfn/409-kill-old-admin
Remove old auth page
Commit: 032c779d3c1455ba34603999445b3d26afebd5dd
https://github.com/okfn/ckan/commit/032c779d3c1455ba34603999445b3d26afebd5dd
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/controllers/datastore.py
M ckan/controllers/package.py
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:
-----------
Merge branch '362-remove-old-datastore'
Conflicts:
ckan/templates/package/snippets/data_api_button.html
Commit: f8089c9598ff26f07b05eb7a24faf75175f333db
https://github.com/okfn/ckan/commit/f8089c9598ff26f07b05eb7a24faf75175f333db
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 9dd058ef8f9441f5f6d0f8da5916a2812cff711c
https://github.com/okfn/ckan/commit/9dd058ef8f9441f5f6d0f8da5916a2812cff711c
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
Log Message:
-----------
Small template tweaks
Commit: be6c301ddf4df488f34c76d1fb9f7548252ac902
https://github.com/okfn/ckan/commit/be6c301ddf4df488f34c76d1fb9f7548252ac902
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/new_authz.py
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
Log Message:
-----------
Adds helper text and other tweaks to templates
Commit: 01c7cc9bc146d58438e3c4b1119c09f958d62257
https://github.com/okfn/ckan/commit/01c7cc9bc146d58438e3c4b1119c09f958d62257
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
Use ordered dict
Commit: 4c147ad0474a8d8babd6981cc0b5e2489e14307c
https://github.com/okfn/ckan/commit/4c147ad0474a8d8babd6981cc0b5e2489e14307c
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/new_authz.py
M ckan/templates/organization/members.html
Log Message:
-----------
Translate roles
Commit: d9022c754798acb872b2dc8ddb788cb69ae90360
https://github.com/okfn/ckan/commit/d9022c754798acb872b2dc8ddb788cb69ae90360
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix default role
Commit: 65e00131e7786e9233cad23aaa65a3028a2599e8
https://github.com/okfn/ckan/commit/65e00131e7786e9233cad23aaa65a3028a2599e8
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/new_authz.py
Log Message:
-----------
Get proper role for member edit
Commit: 31d384534bdf3400d39641d4b7ca530ac0a3c25a
https://github.com/okfn/ckan/commit/31d384534bdf3400d39641d4b7ca530ac0a3c25a
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/organization/members.html
Log Message:
-----------
Tweaked column width for after boostrap upgrade from master
Commit: 14716b77366f14d6689ea46cf0ec6e5b8b6e021b
https://github.com/okfn/ckan/commit/14716b77366f14d6689ea46cf0ec6e5b8b6e021b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix user dict issue
Commit: b5bc2fd67b863ee82f6f2463843e6641579f29df
https://github.com/okfn/ckan/commit/b5bc2fd67b863ee82f6f2463843e6641579f29df
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/admin.py
R ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/new_authz.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/dashboard.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
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
A ckan/public/base/vendor/bootstrap/js/.jshintrc
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
R 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/bootstrap.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.min.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/public/base/vendor/resource.config
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
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/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/package/base_form_page.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
R ckan/templates/package/resource_api_data.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
M ckan/templates/user/edit_user_form.html
M ckan/tests/functional/api/test_activity.py
R ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_package.py
M setup.py
Log Message:
-----------
Merge branch 'master' into 278-bulk-updates
Conflicts:
ckan/templates/organization/index.html
minor merge conflict
Compare: https://github.com/okfn/ckan/compare/7ffb1354dde1...b5bc2fd67b86
More information about the ckan-changes
mailing list