[ckan-changes] [okfn/ckan] 9c8336: [#300] - Updated the font awesome library to 3.0.2
GitHub
noreply at github.com
Tue Feb 19 14:23:57 UTC 2013
Branch: refs/heads/idatasetform-fixes
Home: https://github.com/okfn/ckan
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: 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: 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: 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: b983791d3142f440ee06b0fdba5c8f9e4d663965
https://github.com/okfn/ckan/commit/b983791d3142f440ee06b0fdba5c8f9e4d663965
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: 8c3a775e67646909f6ab2343f668bca3d1e93603
https://github.com/okfn/ckan/commit/8c3a775e67646909f6ab2343f668bca3d1e93603
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#417] 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: ff4f03d24ba7d61af8c20a67f85e2203bf06217b
https://github.com/okfn/ckan/commit/ff4f03d24ba7d61af8c20a67f85e2203bf06217b
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: 8f86134ae5c4475ce0c41fbd281e648783dcfef7
https://github.com/okfn/ckan/commit/8f86134ae5c4475ce0c41fbd281e648783dcfef7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/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
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/index.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
M ckan/templates/organization/index.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/base_form_page.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into idatasetform-fixes
Commit: 95035634426d98119a3768774db0985abc025b96
https://github.com/okfn/ckan/commit/95035634426d98119a3768774db0985abc025b96
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:
-----------
[#417] Update a couple of tests broken by commit e023d8a
Compare: https://github.com/okfn/ckan/compare/e023d8a5f50b...95035634426d
More information about the ckan-changes
mailing list