Skip to content

Commit c116a90

Browse files
committed
Merge branch 'develop'
2 parents 6d29620 + b19d9b4 commit c116a90

72 files changed

Lines changed: 250 additions & 266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

exponent_constants.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@
590590
define('BS4_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>');
591591
} // cdn Bootstrap v4.x script
592592
if (!defined('BS5_SCRIPT')) {
593-
define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js" integrity="sha384-ndDqU0Gzau9qJ1lfW4pNLlhNTkCfHzAVBReH9diLvGRem5+R9g2FzA8ZGN954O5Q" crossorigin="anonymous"></script>');
593+
define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>');
594594
} // cdn Bootstrap v5.x script
595595
/**
596596
* Font-Awesome CDN links

external/ExtPrograms.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Doctrine Deprecations,1.1.2,github.com/doctrine/deprecations,1.1.5,needed by Doc
55
EmailValidator,3.2.6,github.com/egulias/EmailValidator,3.2.6/4.0.4,needed by swiftmailer v6; change folder structure and add autoloader to main file
66
ups-php,0.2,github.com/sanbornm/ups-php,0.2,"updated/fixed xml, etc to work"
77
fedex-php,31.0.0,www.fedex.com/wpor/web/jsp/drclinks.jsp?links=wss/getstarted.html,31.0.0,copy/edit RateAvailableServicesWebServiceClient.php into fedexshippingcalculator->getRates()
8-
Smarty,3.1.27/4.4.1,smarty.net,4.5.5/5.5.2,
8+
Smarty,3.1.27/4.4.1,smarty.net,4.5.6/5.5.2,
99
phpthumb,1.7.23exp,github.com/JamesHeinrich/phpThumb,1.7.23,phpThumb.config.php - we also allow &amp in parsing and err command
1010
getid3,1.9.23,github.com/JamesHeinrich/getID3,1.9.23,
1111
minify,2.3.3,github.com/mrclay/minify,2.3.3/3.0.4/4.0.1,modify config.php
@@ -33,11 +33,11 @@ popper.js/floating-ui,1.16.1,github.com/FezVrasta/popper.js,1.16.1/2.11.8,needed
3333
Bootswatch2,2.3.2,bootswatch.com,2.3.2,
3434
Bootswatch3,3.4.1+1,bootswatch.com,3.4.1+1,change 1st line variables.less comment to output to .css file
3535
Bootswatch4,4.6.2,bootswatch.com,4.6.2,change 1st line variables.scss comment to output to .css file
36-
Bootswatch5,5.3.7,bootswatch.com,5.3.7,change 1st line variables.scss comment to output to .css file
36+
Bootswatch5,5.3.8,bootswatch.com,5.3.8,change 1st line variables.scss comment to output to .css file
3737
Font-Awesome3,3.2.1,fontawesome.github.com/Font-Awesome,3.2.1,updated FontAwesomePath in variables.less
3838
Font-Awesome4,4.7.0,fontawesome.github.com/Font-Awesome,4.7.0,
3939
Font-Awesome5,5.15.4,fontawesome.com,5.15.4,add import all 'fonts' sheets into main sheet
40-
Font-Awesome6,6.7.2,fontawesome.com,6.7.2/7.0.0,add import all 'fonts' sheets into main sheet
40+
Font-Awesome6,6.7.2,fontawesome.com,6.7.2/7.0.1,add import all 'fonts' sheets into main sheet
4141
Bootstrap-Icons,1.13.1,icons.getbootstrap.com,1.13.1,"patched bootstrap-icons.scss for custom folder structure, includes animation & size variables"
4242
Adminer,4.8.1exp,www.adminer.org,4.8.4evo,"customized plugins: tinymce, ckeditor, previewSerialized, edit-textarea & edit-calendar; edit sql tweak"
4343
SimpleAjaxUploader,2.6.7,github.com/LPology/Simple-Ajax-Uploader,2.6.7,also converted to yui module 2.5.3
@@ -65,7 +65,7 @@ validate,1.21.0exp,jqueryvalidation.org,1.21.0,edit for 'undefined' in 'min' & '
6565
Countdown,1.1,tutorialzine.com/2011/12/countdown-jquery,1.1,
6666
timepicker,1.6.3,trentrichardson.com/examples/timepicker,1.6.3,used by adminer
6767
TimeCircles,1.5.3,github.com/wimbarelds/TimeCircles,1.5.3,
68-
DataTables,2.3.3,www.datatables.net,1.13.8/2.3.3,includes boostrap2 integration w/ renamed 1.10.7 version
68+
DataTables,2.3.4,www.datatables.net,1.13.8/2.3.4,includes boostrap2 integration w/ renamed 1.10.7 version
6969
DataTables Checkboxes,1.3.0,github.com/gyrocode/jquery-datatables-checkboxes,1.3.0,
7070
DataTables Tabletools,2.2.4,www.datatables.net,2.2.4,replaced by 'Buttons' in 1.10.8
7171
Responsive DataTables,0.2.0,github.com/Comanche/datatables-responsive,0.2.0,replaced by 'Responsive' in 1.10.8
@@ -109,7 +109,7 @@ iLess,2.2.0,github.com/mishal/iless,2.2.0,"optional, has issues with bootstrap v
109109
Kint,1.1/2.2/6.0.1,github.com/kint-php/kint,6.0.1,"optional, for formatted edebug output"
110110
,,,,
111111
Not included yet,,,,
112-
DataTables Buttons,,www.datatables.net,2.4.2/3.2.4,
112+
DataTables Buttons,,www.datatables.net,2.4.2/3.2.5,
113113
DataTables Responsive,,www.datatables.net,2.5.0/3.0.6,
114114
,,,,
115115
No longer included,,,,

external/bootstrap5/scss/brite/_bootswatch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Brite 5.3.7 */
1+
/* Brite 5.3.8 */
22
// Bootswatch
33

44

external/bootstrap5/scss/brite/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Brite 5.3.7
1+
// Brite 5.3.8
22
// Bootswatch
33

44
$theme: "brite" !default;

external/bootstrap5/scss/cerulean/_bootswatch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Cerulean 5.3.7 */
1+
/* Cerulean 5.3.8 */
22
// Bootswatch
33

44

external/bootstrap5/scss/cerulean/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Cerulean 5.3.7
1+
// Cerulean 5.3.8
22
// Bootswatch
33

44
$theme: "cerulean" !default;

external/bootstrap5/scss/cosmo/_bootswatch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Cosmo 5.3.7 */
1+
/* Cosmo 5.3.8 */
22
// Bootswatch
33

44

external/bootstrap5/scss/cosmo/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Cosmo 5.3.7
1+
// Cosmo 5.3.8
22
// Bootswatch
33

44
$theme: "cosmo" !default;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/* Default 5.3.7 */
1+
/* Default 5.3.8 */
22
// Placeholder for NO Swatch

external/bootstrap5/scss/cyborg/_bootswatch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Cyborg 5.3.7 */
1+
/* Cyborg 5.3.8 */
22
// Bootswatch
33

44

0 commit comments

Comments
 (0)