Skip to content

Commit

Permalink
Merge pull request #2647 from pymedusa/release-0.1.12
Browse files Browse the repository at this point in the history
Release 0.1.12
  • Loading branch information
p0psicles authored Apr 21, 2017
2 parents a011615 + 5757230 commit 9c19b10
Show file tree
Hide file tree
Showing 342 changed files with 64,271 additions and 28,990 deletions.
12 changes: 4 additions & 8 deletions .build/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,19 @@ module.exports = function(grunt) { // eslint-disable-line xo/filename-case
dependencies: {
},
mainFiles: {
'tablesorter': [
tablesorter: [
'dist/js/jquery.tablesorter.combined.js',
'dist/js/widgets/widget-columnSelector.min.js',
'dist/js/widgets/widget-stickyHeaders.min.js',
'dist/css/theme.blue.min.css'
],
'bootstrap': [
bootstrap: [
'dist/css/bootstrap.min.css',
'dist/js/bootstrap.min.js'
],
'bootstrap-formhelpers': [
'dist/js/bootstrap-formhelpers.min.js'
],
'isotope': [
isotope: [
'dist/isotope.pkgd.min.js'
],
'outlayer': [
outlayer: [
'item.js',
'outlayer.js'
]
Expand Down
22 changes: 12 additions & 10 deletions .build/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@
],
"dependencies": {
"jquery": "3.0.0",
"bootstrap": "3.3.7",
"underscore": "^1.8.3",
"bootstrap-hover-dropdown": "2.2.1",
"jquery-ui": "1.12.1",
"bootstrap": "3.3.7",
"jqueryui-touch-punch": "*",
"jquery-form": "4.0.1",
"jquery-tokeninput": "^1.7.0",
"jquery-confirm": "2.5.2",
"jquery-backstretch": "^2.1.15",
"bootstrap3-typeahead": "4.0.2",
"jqueryui-touch-punch": "*",
"lodash": "4.17.4",
"underscore.string": "^3.3.4",
"loglevel": "1.4.1",
"timeago": "1.5.4",
"pnotify": "2.1.0",
"qtip2": "2.2.1",
"tablesorter": "jquery.tablesorter#2.24.5",
"jquery-confirm": "2.5.2",
"bootstrap-formhelpers": "2.3.0",
"tablesorter": "jquery.tablesorter#2.28.8",
"isotope": "3.0.1",
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",
"jquery-backstretch-2": "^2.1.13"
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic"
},
"resolutions": {
"bootstrap": "3.3.7",
"jquery": "2.1.4"
"jquery": "3.0.0"
}
}
Loading

0 comments on commit 9c19b10

Please sign in to comment.