Merge branch 'master' into gh-pages

2024-11-15 23:54:22 +00:00 · 2016-06-15 14:01:18 -05:00 · 2016-06-15 14:01:18 -05:00 · 74f47f6e63
commit 74f47f6e63
parent 3e8eafbca0 e313cdea41
56 changed files with 4 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -101,6 +101,10 @@ If you would like to contribute, please...

 View the [complete change log here](//github.com/Mottie/tablesorter/wiki/Changes).

+#### <a name="v2.26.4">Version 2.26.4</a> (6/15/2016)
+
+* Version bump due to merging issues.
+
 #### <a name="v2.26.3">Version 2.26.3</a> (6/15/2016)

 * Distribution: Provide source css & js files on CDNJS. Fixes [issue #1222](https://github.com/Mottie/tablesorter/issues/1222).
--- a/addons/pager/icons/first.png
+++ b/addons/pager/icons/first.png
--- a/addons/pager/icons/last.png
+++ b/addons/pager/icons/last.png
--- a/addons/pager/icons/next.png
+++ b/addons/pager/icons/next.png
--- a/addons/pager/icons/prev.png
+++ b/addons/pager/icons/prev.png
--- a/css/images/bootstrap-black-unsorted.png
+++ b/css/images/bootstrap-black-unsorted.png
--- a/css/images/bootstrap-white-unsorted.png
+++ b/css/images/bootstrap-white-unsorted.png
--- a/css/images/dragtable-handle.png
+++ b/css/images/dragtable-handle.png
--- a/css/images/dropbox-asc-hovered.png
+++ b/css/images/dropbox-asc-hovered.png
--- a/css/images/dropbox-asc.png
+++ b/css/images/dropbox-asc.png
--- a/css/images/dropbox-desc-hovered.png
+++ b/css/images/dropbox-desc-hovered.png
--- a/css/images/dropbox-desc.png
+++ b/css/images/dropbox-desc.png
--- a/css/images/metro-black-asc.png
+++ b/css/images/metro-black-asc.png
--- a/css/images/metro-black-desc.png
+++ b/css/images/metro-black-desc.png
--- a/css/images/metro-unsorted.png
+++ b/css/images/metro-unsorted.png
--- a/css/images/metro-white-asc.png
+++ b/css/images/metro-white-asc.png
--- a/css/images/metro-white-desc.png
+++ b/css/images/metro-white-desc.png
--- a/dist/css/images/bootstrap-black-unsorted.png
+++ b/dist/css/images/bootstrap-black-unsorted.png
--- a/dist/css/images/bootstrap-white-unsorted.png
+++ b/dist/css/images/bootstrap-white-unsorted.png
--- a/dist/css/images/dragtable-handle.png
+++ b/dist/css/images/dragtable-handle.png
--- a/dist/css/images/dropbox-asc-hovered.png
+++ b/dist/css/images/dropbox-asc-hovered.png
--- a/dist/css/images/dropbox-asc.png
+++ b/dist/css/images/dropbox-asc.png
--- a/dist/css/images/dropbox-desc-hovered.png
+++ b/dist/css/images/dropbox-desc-hovered.png
--- a/dist/css/images/dropbox-desc.png
+++ b/dist/css/images/dropbox-desc.png
--- a/dist/css/images/first.png
+++ b/dist/css/images/first.png
--- a/dist/css/images/last.png
+++ b/dist/css/images/last.png
--- a/dist/css/images/metro-black-asc.png
+++ b/dist/css/images/metro-black-asc.png
--- a/dist/css/images/metro-black-desc.png
+++ b/dist/css/images/metro-black-desc.png
--- a/dist/css/images/metro-unsorted.png
+++ b/dist/css/images/metro-unsorted.png
--- a/dist/css/images/metro-white-asc.png
+++ b/dist/css/images/metro-white-asc.png
--- a/dist/css/images/metro-white-desc.png
+++ b/dist/css/images/metro-white-desc.png
--- a/dist/css/images/next.png
+++ b/dist/css/images/next.png
--- a/dist/css/images/prev.png
+++ b/dist/css/images/prev.png
--- a/docs/css/images/glyphicons-halflings-white.png
+++ b/docs/css/images/glyphicons-halflings-white.png
--- a/docs/css/images/glyphicons-halflings.png
+++ b/docs/css/images/glyphicons-halflings.png
--- a/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+++ b/docs/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
--- a/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
+++ b/docs/css/images/ui-bg_flat_15_cd0a0a_40x100.png
--- a/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
+++ b/docs/css/images/ui-bg_glass_100_e4f1fb_1x400.png
--- a/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
+++ b/docs/css/images/ui-bg_glass_50_3baae3_1x400.png
--- a/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
+++ b/docs/css/images/ui-bg_glass_80_d7ebf9_1x400.png
--- a/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+++ b/docs/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
--- a/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
+++ b/docs/css/images/ui-bg_highlight-hard_70_000000_1x100.png
--- a/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+++ b/docs/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
--- a/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+++ b/docs/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
--- a/docs/css/images/ui-icons_2694e8_256x240.png
+++ b/docs/css/images/ui-icons_2694e8_256x240.png
--- a/docs/css/images/ui-icons_2e83ff_256x240.png
+++ b/docs/css/images/ui-icons_2e83ff_256x240.png
--- a/docs/css/images/ui-icons_3d80b3_256x240.png
+++ b/docs/css/images/ui-icons_3d80b3_256x240.png
--- a/docs/css/images/ui-icons_72a7cf_256x240.png
+++ b/docs/css/images/ui-icons_72a7cf_256x240.png
--- a/docs/css/images/ui-icons_ffffff_256x240.png
+++ b/docs/css/images/ui-icons_ffffff_256x240.png
--- a/docs/css/select2.png
+++ b/docs/css/select2.png
--- a/docs/css/select2x2.png
+++ b/docs/css/select2x2.png
--- a/docs/img/external.png
+++ b/docs/img/external.png
--- a/docs/img/grid-default-thumb.png
+++ b/docs/img/grid-default-thumb.png
--- a/docs/img/link.png
+++ b/docs/img/link.png
--- a/docs/img/screens-blue.png
+++ b/docs/img/screens-blue.png
--- a/docs/img/screens.png
+++ b/docs/img/screens.png