Skip to content

Commit

Permalink
Upgraded some JS dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
noirbizarre committed Apr 12, 2015
1 parent 12b6751 commit 77b1717
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
26 changes: 13 additions & 13 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,43 @@
"bootstrap": "~3.3.1"
},
"dependencies": {
"jquery": "~2.1.1",
"jquery": "~2.1.3",
"jquery-legacy": "jquery#1.11.1",
"normalizeconsole": "https://github.com/Zenovations/console-normalizer.git",
"bootstrap": "~3.3.1",
"font-awesome": "~4.2.0",
"font-awesome": "~4.3.0",
"moment": "~2.10.2",
"bootstrap-markdown": "~2.7.0",
"bootstrap-markdown": "~2.8.0",
"marked": "~0.3.2",
"respond": "~1.4.2",
"jquery.dotdotdot": "~1.6.16",
"selectize": "~0.11.0",
"jquery.dotdotdot": "~1.7.2",
"selectize": "~0.12.0",
"html5shiv": "~3.7.2",
"jquery-timeago": "~1.4.1",
"bootstrap-daterangepicker": "~1.3.21",
"jcrop": "~0.9.12",
"seiyria-bootstrap-slider": "~4.0.1",
"seiyria-bootstrap-slider": "~4.5.7",
"jquery.validation": "~1.13.0",
"x-editable": "noirbizarre/x-editable#1.5.1-nbz",
"requirejs": "~2.1.17",
"requirejs-router": "~0.8.0",
"requirejs-domready": "~2.0.1",
"require-handlebars-plugin": "~0.11.1",
"handlebars": "~2.0.0",
"handlebars": "~3.0.0",
"highstock-components": "~1.3.10",
"d3": "~3.4.11",
"d3": "~3.5.5",
"typeahead.js": "~0.10.5",
"typeahead.js-bootstrap3.less": "~0.2.3",
"i18next": "~1.7.4",
"i18next": "~1.8.0",
"jquery.microdata": "http://git.macropus.org/jquery-microdata/jquery.microdata.js",
"bootstrap-datepicker": "~1.3.0",
"bootstrap-datepicker": "~1.4.0",
"jquery-sortable": "~0.9.12",
"swagger-ui": "https://github.com/swagger-api/swagger-ui.git#1be0f9fa35",
"jquery.browser": "~0.0.6",
"highlightjs": "~8.3.0",
"jquery.browser": "~0.0.7",
"highlightjs": "~8.4.0",
"leaflet": "~0.7.3",
"spin.js": "~2.0.1",
"leaflet.spin": "https://github.com/makinacorpus/Leaflet.Spin.git",
"fineuploader-dist": "~5.0.7"
"fineuploader-dist": "~5.1.3"
}
}
2 changes: 1 addition & 1 deletion udata/static/js/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require.config({
'bootstrap-datepicker': '../bower/bootstrap-datepicker/js/bootstrap-datepicker',
'bootstrap-daterangepicker': '../bower/bootstrap-daterangepicker/daterangepicker',
'selectize': '../bower/selectize/dist/js/standalone/selectize',
'fineuploader': '../bower/fineuploader-dist/dist/jquery.fineuploader',
'fineuploader': '../bower/fineuploader-dist/dist/jquery.fine-uploader',
'bootstrap-slider': '../bower/seiyria-bootstrap-slider/js/bootstrap-slider',
'x-editable': '../bower/x-editable/dist/bootstrap3-editable/js/bootstrap-editable',
'router': '../bower/requirejs-router/router',
Expand Down
4 changes: 2 additions & 2 deletions udata/static/less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
@import "bootstrap-markdown.less";
@import "selectize.bootstrap3.less";
@import "../bower/bootstrap-daterangepicker/daterangepicker-bs3.css";
@import "../bower/bootstrap-datepicker/css/datepicker3.css";
@import "../bower/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css";
@import "../bower/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css";
@import "../bower/fineuploader-dist/dist/fineuploader.css";
@import "../bower/fineuploader-dist/dist/fine-uploader.css";
@import "../bower/jcrop/css/jquery.Jcrop.css";

@selectize-color-item: @label-primary-bg;
Expand Down
2 changes: 1 addition & 1 deletion udata/static/less/udata/search.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../bower/bootstrap-datepicker/css/datepicker3.css";
@import "../bower/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css";

// Search results
ul.search-results {
Expand Down

0 comments on commit 77b1717

Please sign in to comment.