[ckan-changes] [okfn/ckan] 803ea5: Merge branch '300-frontend-dependancies' into 354-...
GitHub
noreply at github.com
Tue Feb 5 18:21:13 UTC 2013
Branch: refs/heads/354-ia-review
Home: https://github.com/okfn/ckan
Commit: 803ea54e2f7fbb48db30c213689fb74ef7d0e223
https://github.com/okfn/ckan/commit/803ea54e2f7fbb48db30c213689fb74ef7d0e223
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
A ckan/public/base/less/font-awesome.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/.jshintrc
A ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
M ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
A ckan/public/base/vendor/bootstrap/js/tests/index.html
A ckan/public/base/vendor/bootstrap/js/tests/phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/server.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
A ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
M ckan/public/base/vendor/bootstrap/less/accordion.less
M ckan/public/base/vendor/bootstrap/less/alerts.less
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
M ckan/public/base/vendor/bootstrap/less/button-groups.less
M ckan/public/base/vendor/bootstrap/less/buttons.less
M ckan/public/base/vendor/bootstrap/less/carousel.less
M ckan/public/base/vendor/bootstrap/less/close.less
M ckan/public/base/vendor/bootstrap/less/code.less
M ckan/public/base/vendor/bootstrap/less/component-animations.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/forms.less
M ckan/public/base/vendor/bootstrap/less/grid.less
M ckan/public/base/vendor/bootstrap/less/hero-unit.less
M ckan/public/base/vendor/bootstrap/less/labels-badges.less
M ckan/public/base/vendor/bootstrap/less/layouts.less
A ckan/public/base/vendor/bootstrap/less/media.less
M ckan/public/base/vendor/bootstrap/less/mixins.less
M ckan/public/base/vendor/bootstrap/less/modals.less
M ckan/public/base/vendor/bootstrap/less/navbar.less
M ckan/public/base/vendor/bootstrap/less/navs.less
M ckan/public/base/vendor/bootstrap/less/pager.less
M ckan/public/base/vendor/bootstrap/less/pagination.less
M ckan/public/base/vendor/bootstrap/less/popovers.less
M ckan/public/base/vendor/bootstrap/less/progress-bars.less
M ckan/public/base/vendor/bootstrap/less/reset.less
M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/bootstrap/less/scaffolding.less
M ckan/public/base/vendor/bootstrap/less/sprites.less
M ckan/public/base/vendor/bootstrap/less/tables.less
A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
A ckan/public/base/vendor/bootstrap/less/tests/forms.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
M ckan/public/base/vendor/bootstrap/less/thumbnails.less
M ckan/public/base/vendor/bootstrap/less/tooltip.less
M ckan/public/base/vendor/bootstrap/less/type.less
M ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
M ckan/public/base/vendor/bootstrap/less/wells.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/index.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
M ckan/templates/organization/index.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/base_form_page.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
Merge branch '300-frontend-dependancies' into 354-ia-review
Commit: fe934bca0539cfe480aa78ce44d6a87eae0f6796
https://github.com/okfn/ckan/commit/fe934bca0539cfe480aa78ce44d6a87eae0f6796
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/variables.less
Log Message:
-----------
[#354] Tweaked variables.less to remove uneeded junk
Commit: 4032fc42a914cc22a4247f1c4620b56d7d86d087
https://github.com/okfn/ckan/commit/4032fc42a914cc22a4247f1c4620b56d7d86d087
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/page.html
Log Message:
-----------
[#354] Made pages full width
Commit: dc0310eb98545364c4644f061d02f1a4da1b0343
https://github.com/okfn/ckan/commit/dc0310eb98545364c4644f061d02f1a4da1b0343
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
A ckan/public/base/images/nav.png
M ckan/public/base/less/ckan.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/templates/home/about.html
M ckan/templates/package/snippets/info.html
Log Message:
-----------
[#354] Lot's of minor tweaks to individual pages
Commit: fdbf7f7ee0fa03aaae8b507660053ac905848db5
https://github.com/okfn/ckan/commit/fdbf7f7ee0fa03aaae8b507660053ac905848db5
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/variables.less
M ckan/templates/header.html
Log Message:
-----------
[#354] Added user masthead
Commit: 690bbb03f81a1421a808e51e4fe4f85ad8891dcf
https://github.com/okfn/ckan/commit/690bbb03f81a1421a808e51e4fe4f85ad8891dcf
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/images/placeholder-application.png
M ckan/public/base/images/placeholder-group.png
M ckan/public/base/images/placeholder-image.png
M ckan/public/base/images/placeholder-organization.png
Log Message:
-----------
[#354] Updated placeholder images to use font awesome
Commit: f209fd3b42706784c444e5007c6ca46681e569bd
https://github.com/okfn/ckan/commit/f209fd3b42706784c444e5007c6ca46681e569bd
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/public/base/less/profile.less
M ckan/templates/group/read_base.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/edit.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/back_to_user_action.html
Log Message:
-----------
[#354] Updated left side bar class and all relevant pages
Commit: 8f07b4f15392df7fe6f37ca3219592c09779f335
https://github.com/okfn/ckan/commit/8f07b4f15392df7fe6f37ca3219592c09779f335
Author: John Martin <me at johnmart.in>
Date: 2013-02-05 (Tue, 05 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/lib/cli.py
A ckan/public/base/images/nav-active.png
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/variables.less
M ckan/templates/group/about.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/organization/about.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
A ckan/templates/package/about.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/info.html
M ckan/templates/snippets/social.html
Log Message:
-----------
[#354] Package pages now work within the new iA now
Compare: https://github.com/okfn/ckan/compare/803ea54e2f7f^...8f07b4f15392
More information about the ckan-changes
mailing list