Changeset [75eccc25c9d428c3953d9f707fa8bda50ddf6435] by dleffler
March 7th, 2014 @ 08:18 PM
Merge branch 'newui' into bs3newui
Conflicts:
external/bootstrap/css/bootstrap.css
external/bootstrap/css/responsive.css
external/bootstrap3/fonts/glyphicons-halflings-regular.eot
external/bootstrap3/fonts/glyphicons-halflings-regular.svg
external/bootstrap3/fonts/glyphicons-halflings-regular.ttf
external/bootstrap3/fonts/glyphicons-halflings-regular.woff
external/bootstrap3/js/affix.js external/bootstrap3/js/alert.js
external/bootstrap3/js/button.js external/bootstrap3/js/carousel.js
external/bootstrap3/js/collapse.js
external/bootstrap3/js/dropdown.js external/bootstrap3/js/modal.js
external/bootstrap3/js/popover.js
external/bootstrap3/js/scrollspy.js external/bootstrap3/js/tab.js
external/bootstrap3/js/tooltip.js
external/bootstrap3/js/transition.js
external/bootstrap3/less/bootstrap.less
external/bootstrap3/less/button-groups.less
external/bootstrap3/less/buttons.less
external/bootstrap3/less/carousel.less
external/bootstrap3/less/dropdowns.less
external/bootstrap3/less/forms.less
external/bootstrap3/less/grid.less
external/bootstrap3/less/input-groups.less
external/bootstrap3/less/mixins.less
external/bootstrap3/less/modals.less
external/bootstrap3/less/navbar.less
external/bootstrap3/less/normalize.less
external/bootstrap3/less/panels.less
external/bootstrap3/less/popovers.less
external/bootstrap3/less/print.less
external/bootstrap3/less/responsive-utilities.less
external/bootstrap3/less/scaffolding.less
external/bootstrap3/less/thumbnails.less
external/bootstrap3/less/type.less
external/bootstrap3/less/variables.less
framework/core/assets/css/forms-bootstrap.css
framework/core/expFramework.php
framework/core/subsystems/expTheme.php
framework/modules/navigation/assets/css/dropdown-bootstrap.css
framework/plugins/block.form.php
https://github.com/exponentcms/exponent-cms/commit/75eccc25c9d428c3...
Committed by dleffler
- A external/bootstrap3/js/.jscs.json
- A external/bootstrap3/js/.jshintrc
- A external/bootstrap3/js/tests/index.html
- A external/bootstrap3/js/tests/unit/affix.js
- A external/bootstrap3/js/tests/unit/alert.js
- A external/bootstrap3/js/tests/unit/button.js
- A external/bootstrap3/js/tests/unit/carousel.js
- A external/bootstrap3/js/tests/unit/collapse.js
- A external/bootstrap3/js/tests/unit/dropdown.js
- A external/bootstrap3/js/tests/unit/modal.js
- A external/bootstrap3/js/tests/unit/phantom.js
- A external/bootstrap3/js/tests/unit/popover.js
- A external/bootstrap3/js/tests/unit/scrollspy.js
- A external/bootstrap3/js/tests/unit/tab.js
- A external/bootstrap3/js/tests/unit/tooltip.js
- A external/bootstrap3/js/tests/vendor/jquery.js
- A external/bootstrap3/js/tests/vendor/qunit.css
- A external/bootstrap3/js/tests/vendor/qunit.js
- A external/bootstrap3/less/.csscomb.json
- A external/bootstrap3/less/.csslintrc
- A external/font-awesome-4/css/font-awesome.css
- A external/font-awesome-4/css/font-awesome.min.css
- A external/font-awesome-4/fonts/FontAwesome.otf
- A external/font-awesome-4/fonts/fontawesome-webfont.eot
- A external/font-awesome-4/fonts/fontawesome-webfont.svg
- A external/font-awesome-4/fonts/fontawesome-webfont.ttf
- A external/font-awesome-4/fonts/fontawesome-webfont.woff
- A external/font-awesome-4/less/bordered-pulled.less
- A external/font-awesome-4/less/core.less
- A external/font-awesome-4/less/fixed-width.less
- A external/font-awesome-4/less/font-awesome.less
- A external/font-awesome-4/less/icons.less
- A external/font-awesome-4/less/larger.less
- A external/font-awesome-4/less/list.less
- A external/font-awesome-4/less/mixins.less
- A external/font-awesome-4/less/path.less
- A external/font-awesome-4/less/rotated-flipped.less
- A external/font-awesome-4/less/spinning.less
- A external/font-awesome-4/less/stacked.less
- A external/font-awesome-4/less/variables.less
- A external/font-awesome-4/scss/_bordered-pulled.scss
- A external/font-awesome-4/scss/_core.scss
- A external/font-awesome-4/scss/_fixed-width.scss
- A external/font-awesome-4/scss/_icons.scss
- A external/font-awesome-4/scss/_larger.scss
- A external/font-awesome-4/scss/_list.scss
- A external/font-awesome-4/scss/_mixins.scss
- A external/font-awesome-4/scss/_path.scss
- A external/font-awesome-4/scss/_rotated-flipped.scss
- A external/font-awesome-4/scss/_spinning.scss
- A external/font-awesome-4/scss/_stacked.scss
- A external/font-awesome-4/scss/_variables.scss
- A external/font-awesome-4/scss/font-awesome.scss
- A files/Comcast.jpg
- A files/Deloitte_Centre_8_537x358.jpg
- A framework/core/assets/bs3/alerts.less
- A framework/core/assets/bs3/badges.less
- A framework/core/assets/bs3/bootstrap.css
- A framework/core/assets/bs3/bootstrap.less
- A framework/core/assets/bs3/bootswatch.less
- A framework/core/assets/bs3/breadcrumbs.less
- A framework/core/assets/bs3/button-groups.less
- A framework/core/assets/bs3/buttons.less
- A framework/core/assets/bs3/carousel.less
- A framework/core/assets/bs3/close.less
- A framework/core/assets/bs3/code.less
- A framework/core/assets/bs3/component-animations.less
- A framework/core/assets/bs3/dropdowns.less
- A framework/core/assets/bs3/forms.less
- A framework/core/assets/bs3/glyphicons.less
- A framework/core/assets/bs3/grid.less
- A framework/core/assets/bs3/input-groups.less
- A framework/core/assets/bs3/jumbotron.less
- A framework/core/assets/bs3/labels.less
- A framework/core/assets/bs3/list-group.less
- A framework/core/assets/bs3/media.less
- A framework/core/assets/bs3/mixins.less
- A framework/core/assets/bs3/modals.less
- A framework/core/assets/bs3/navbar.less
- A framework/core/assets/bs3/navs.less
- A framework/core/assets/bs3/normalize.less
- A framework/core/assets/bs3/pager.less
- A framework/core/assets/bs3/pagination.less
- A framework/core/assets/bs3/panels.less
- A framework/core/assets/bs3/popovers.less
- A framework/core/assets/bs3/print.less
- A framework/core/assets/bs3/progress-bars.less
- A framework/core/assets/bs3/responsive-utilities.less
- A framework/core/assets/bs3/scaffolding.less
- A framework/core/assets/bs3/tables.less
- A framework/core/assets/bs3/theme.less
- A framework/core/assets/bs3/thumbnails.less
- A framework/core/assets/bs3/tooltip.less
- A framework/core/assets/bs3/type.less
- A framework/core/assets/bs3/utilities.less
- A framework/core/assets/bs3/variables.less
- A framework/core/assets/bs3/variables2.less
- A framework/core/assets/bs3/wells.less
- A framework/core/assets/css/newui.css
- A framework/core/assets/css/newui.less
- A framework/core/assets/less/lesshat.less
- A framework/core/forms/bootstrap3/antispamcontrol.php
- A framework/core/forms/bootstrap3/assets/autocomplete/autocomplete.css
- A framework/core/forms/bootstrap3/assets/autocomplete/loader.gif
- A framework/core/forms/bootstrap3/assets/calendar/calbtn.gif
- A framework/core/forms/bootstrap3/assets/calendar/calendarcontrol.css
- A framework/core/forms/bootstrap3/assets/colorpicker/colorpicker.css
- A framework/core/forms/bootstrap3/assets/files/add.png
- A framework/core/forms/bootstrap3/assets/files/af-sprite.png
- A framework/core/forms/bootstrap3/assets/files/attachable-files.css
- A framework/core/forms/bootstrap3/assets/files/attachable_hd.png
- A framework/core/forms/bootstrap3/assets/files/dag-h.gif
- A framework/core/forms/bootstrap3/assets/files/delete.png
- A framework/core/forms/bootstrap3/assets/files/drag-h.png
- A framework/core/forms/bootstrap3/assets/files/drag.gif
- A framework/core/forms/bootstrap3/assets/files/drag.png
- A framework/core/forms/bootstrap3/assets/files/generic_22x22.png
- A framework/core/forms/bootstrap3/assets/files/pdf_22x22.png
- A framework/core/forms/bootstrap3/assets/files/word_22x22.png
- A framework/core/forms/bootstrap3/assets/slider/bg-fader.gif
- A framework/core/forms/bootstrap3/assets/slider/thumb-n.gif
- A framework/core/forms/bootstrap3/autocompletecontrol.php
- A framework/core/forms/bootstrap3/buttongroupcontrol.php
- A framework/core/forms/bootstrap3/calendarcontrol.php
- A framework/core/forms/bootstrap3/checkboxcontrol.php
- A framework/core/forms/bootstrap3/ckeditorcontrol.php
- A framework/core/forms/bootstrap3/colorcontrol.php
- A framework/core/forms/bootstrap3/configcontrol.php
- A framework/core/forms/bootstrap3/contactcontrol.php
- A framework/core/forms/bootstrap3/countrycontrol.php
- A framework/core/forms/bootstrap3/countryregioncontrol.php
- A framework/core/forms/bootstrap3/customcontrol.php
- A framework/core/forms/bootstrap3/datetimecontrol.js
- A framework/core/forms/bootstrap3/datetimecontrol.php
- A framework/core/forms/bootstrap3/dropdowncontrol.php
- A framework/core/forms/bootstrap3/emailcontrol.php
- A framework/core/forms/bootstrap3/filemanagercontrol.php
- A framework/core/forms/bootstrap3/formcontrol.php
- A framework/core/forms/bootstrap3/genericcontrol.php
- A framework/core/forms/bootstrap3/hiddenfieldcontrol.php
- A framework/core/forms/bootstrap3/htmlcontrol.php
- A framework/core/forms/bootstrap3/htmleditorcontrol.php
- A framework/core/forms/bootstrap3/listbuildercontrol.js
- A framework/core/forms/bootstrap3/listbuildercontrol.php
- A framework/core/forms/bootstrap3/listcontrol.php
- A framework/core/forms/bootstrap3/massmailcontrol.php
- A framework/core/forms/bootstrap3/monthyearcontrol.php
- A framework/core/forms/bootstrap3/nextbackcontrol.php
- A framework/core/forms/bootstrap3/numbercontrol.php
- A framework/core/forms/bootstrap3/pagecontrol.php
- A framework/core/forms/bootstrap3/passwordcontrol.php
- A framework/core/forms/bootstrap3/popupdatetimecontrol.php
- A framework/core/forms/bootstrap3/quantitycontrol.php
- A framework/core/forms/bootstrap3/radiocontrol.php
- A framework/core/forms/bootstrap3/radiogroupcontrol.php
- A framework/core/forms/bootstrap3/rangecontrol.php
- A framework/core/forms/bootstrap3/statescontrol.php
- A framework/core/forms/bootstrap3/tagpickercontrol.php
- A framework/core/forms/bootstrap3/tagtreecontrol.php
- A framework/core/forms/bootstrap3/telcontrol.php
- A framework/core/forms/bootstrap3/textcontrol.php
- A framework/core/forms/bootstrap3/texteditorcontrol.php
- A framework/core/forms/bootstrap3/uploadcontrol.php
- A framework/core/forms/bootstrap3/urlcontrol.php
- A framework/core/forms/bootstrap3/yuicalendarcontrol.php
- A framework/core/forms/bootstrap3/yuidatetimecontrol.php
- A framework/core/forms/bootstrap3/yuieditorcontrol.php
- A framework/modules/administration/assets/css/exp-toolbar.css
- A framework/modules/administration/assets/css/exp-toolbar.less
- A framework/modules/administration/views/administration/logo.tpl
- A framework/modules/administration/views/administration/toolbar.newui.tpl
- A framework/modules/common/views/configure/module.newui.tpl
- A framework/modules/common/views/scaffold/configure.newui.tpl
- A framework/modules/container/assets/css/container-newui.css
- A framework/modules/container/assets/css/container-newui.less
- A framework/modules/container/views/container/edit.newui.tpl
- A framework/modules/container/views/container/showall.newui.tpl
- A framework/modules/users/views/login/showlogin.newui.tpl
- A framework/plugins/newui/block.form.php
- A framework/plugins/newui/block.permissions.php
- A framework/plugins/newui/function.bootstrap_navbar.php
- A framework/plugins/newui/function.control.php
- A framework/plugins/newui/function.ddrerank.php
- A framework/plugins/newui/function.export_pdf_link.php
- A framework/plugins/newui/function.getchromemenu.php
- A framework/plugins/newui/function.help.php
- A framework/plugins/newui/function.icon.php
- A framework/plugins/newui/function.printer_friendly_link.php
- R framework/modules/navigation/assets/css/dropdown-bootstrap.css
- R install/not_configured
- M framework/conf/extensions/display.defaults.php
- M framework/core/expFramework.php
- M framework/core/forms/basetemplate.php
- M framework/core/forms/controllertemplate.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/administration/controllers/administrationController.php
- M framework/modules/administration/menus/admin.php
- M framework/modules/administration/menus/ecomm.php
- M framework/modules/administration/menus/files.php
- M framework/modules/administration/menus/upcomingevents.php
- M framework/modules/administration/menus/user.php
- M framework/modules/administration/menus/z-navigation.php
- M framework/modules/users/views/login/showlogin.tpl
- M framework/plugins/block.form.php
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS