Skip to content

Commit

Permalink
Merge branch '1.7.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@boonebgorges
boonebgorges committed Oct 11, 2023
2 parents 88d46da + 3ddc38c commit c4619a7
Show file tree
Hide file tree
Showing 1,504 changed files with 396,045 additions and 145,037 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
[submodule "wp-content/plugins/openlab-connections"]
path = wp-content/plugins/openlab-connections
url = [email protected]:openlab-at-city-tech/openlab-connections
[submodule "wp-content/plugins/openlab-announcements"]
path = wp-content/plugins/openlab-announcements
url = [email protected]:openlab-at-city-tech/openlab-announcements
2 changes: 1 addition & 1 deletion wp-config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

// Version of the OpenLab. Used for asset versioning and cache busting.
define( 'OL_VERSION', '1.7.69' );
define( 'OL_VERSION', '1.7.71' );

if ( defined( 'DO_SHARDB' ) && DO_SHARDB ) {
require __DIR__ . '/db-settings.php';
Expand Down
22 changes: 11 additions & 11 deletions wp-content/js/buddypress.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,19 +418,19 @@ function bp_get_querystring( n ) {

//Hide the sort form submit, we're gonna submit on change
$('#bp-group-documents-sort-form input[type=submit]').hide();
$('#bp-group-documents-sort-form select[name=order]').change(function(){
$('#bp-group-documents-sort-form select[name=order]').on( 'change', function(){
$('form#bp-group-documents-sort-form').submit();
});

//Hide the category form submit, we're gonna submit on change
$('#bp-group-documents-category-form input[type=submit]').hide();
$('#bp-group-documents-category-form select[name=category]').change(function(){
$('#bp-group-documents-category-form select[name=category]').on( 'change', function(){
$('form#bp-group-documents-category-form').submit();
});

//Hide the upload form by default, expand as needed
$('#bp-group-documents-upload-button').show();
$('#bp-group-documents-upload-button').click(function(){
$('#bp-group-documents-upload-button').on( 'click', function(){
$('#bp-group-documents').addClass('is-edit-mode');
return false;
});
Expand All @@ -440,12 +440,12 @@ function bp_get_querystring( n ) {
}

//prefill the new category field
$('input.bp-group-documents-new-category').val('New Category...').css('color','#999').focus(function(){
$('input.bp-group-documents-new-category').val('New Category...').css('color','#999').on( 'focus', function(){
$(this).val('').css('color','inherit');
});

//check for presence of a file before submitting form
$('form#bp-group-documents-form').submit(function(){
$('form#bp-group-documents-form').on( 'submit', function(){

//check for pre-filled values, and remove before sumitting
if( $('input.bp-group-documents-new-category').val() == 'New Category...' ) {
Expand All @@ -461,7 +461,7 @@ function bp_get_querystring( n ) {
});

//validate group admin form before submitting
$('form#group-settings-form').submit(function() {
$('form#group-settings-form').on( 'submit', function() {

//check for pre-filled values, and remove before sumitting
if( $('input.bp-group-documents-new-category').val() == 'New Category...' ) {
Expand All @@ -470,12 +470,12 @@ function bp_get_querystring( n ) {
});

//Make the user confirm when deleting a document
$('a#bp-group-documents-delete').click(function(){
$('a#bp-group-documents-delete').on( 'click', function(){
return confirm('Are you sure you wish to permanently delete this document?');
});

//Track when a user clicks a document via Ajax
$('a.group-documents-title').add($('a.group-documents-icon')).click(function(){
$('a.group-documents-title').add($('a.group-documents-icon')).on( 'click', function(){
dash_position = $(this).attr('id').lastIndexOf('-');
document_num = $(this).attr('id').substring(dash_position+1);

Expand All @@ -487,12 +487,12 @@ function bp_get_querystring( n ) {
});

//Make user confirm when deleting a category
$('a.group-documents-category-delete').click(function(){
$('a.group-documents-category-delete').on( 'click', function(){
return confirm('Are you sure you wish to permanently delete this category?');
});

//add new single categories in the group admin screen via ajax
$('#group-documents-group-admin-categories input[value=Add]').click(function(){
$('#group-documents-group-admin-categories input[value=Add]').on( 'click', function(){
$.post(ajaxurl, {
action:'group_documents_add_category',
category:$('input[name=bp_group_documents_new_category]').val()
Expand All @@ -503,7 +503,7 @@ function bp_get_querystring( n ) {
});

//delete single categories in the group admin screen via ajax
$('#group-documents-group-admin-categories a.group-documents-category-delete').click(function(){
$('#group-documents-group-admin-categories a.group-documents-category-delete').on( 'click', function(){
cat_id_string = $(this).parent('li').attr('id');
pos = cat_id_string.indexOf('-');
cat_id = cat_id_string.substring(pos+1);
Expand Down
7 changes: 6 additions & 1 deletion wp-content/mu-plugins/openlab-plugin-management.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ function openlab_hide_plugins( $plugins ) {
'dw-question-answer/dw-question-answer.php',
'dynamic-widgets/dynamic-widgets.php',
'easy-table/easy-table.php',
'edge-suite/edge-suite.php',
'elasticpress/elasticpress.php',
'elasticpress-buddypress/elasticpress-buddypress.php',
'elasticpress-buddypress/elasticpress-rest.php',
'embed-comment-images/eiic.php',
'embed-google-map/embed_google_map.php',
'enable-jquery-migrate-helper/enable-jquery-migrate-helper.php',
'enigma/enigma.php',
Expand All @@ -67,11 +69,12 @@ function openlab_hide_plugins( $plugins ) {
'page-links-to/page-links-to.php',
'pagemash/pagemash.php',
'page-tagger/page-tagger.php',
'papercite/papercite-wp-plugin.php',
'pdf-embedder/pdf_embedder.php',
'pdfembedder-premium/mobile_pdf_embedder.php',
'post-gallery-widget/post-gallery.php',
'query-monitor/query-monitor.php',
'reckoning/reckoning.php',
'quiz-maker/quiz-maker.php',
'rederly.php',
'simple-drop-cap/simple-drop-cap.php',
'simple-pull-quote/simple-pull-quote.php',
Expand All @@ -86,13 +89,15 @@ function openlab_hide_plugins( $plugins ) {
'tinymce-comment-field/tinymce-comment-field.php',
'titan-framework/titan-framework.php',
'ufhealth-require-image-alt-tags/ufhealth-require-image-alt-tags.php',
'watupro/watupro.php',
'webwork/webwork.php',
'webworkqa/webwork.php',
'_webwork/webwork.php',
'wp-accessibility/wp-accessibility',
'wp-ajax-edit-comments/wp-ajax-edit-comments.php',
'wp-dpla/wp-dpla.php',
'wp-latex/wp-latex.php',
'wp-link-status/wp-link-status.php',
'wp-pro-quiz/wp-pro-quiz.php',
'wp-post-to-pdf/wp-post-to-pdf.php',
'wp-simile-timeline/timeline.php',
Expand Down
1 change: 1 addition & 0 deletions wp-content/mu-plugins/openlab-theme-fixes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function() {
// All of the below require only jQuery.
case 'education-pro' :
case 'hamilton':
case 'hemingway' :
case 'koji' :
case 'lingonberry' :
$subdir = $t;
Expand Down
9 changes: 9 additions & 0 deletions wp-content/mu-plugins/theme-fixes/hemingway/hemingway.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@
color: #a8a8a8;
}

.post-nav-type-label {
color: #595959;
font-size: .7em;
font-weight: 700;
letter-spacing: 1px;
margin: 0 0 7px;
text-transform: uppercase;
}

/**contrast error fixing**/
body .tagcloud a{
background: #595959;
Expand Down
6 changes: 6 additions & 0 deletions wp-content/mu-plugins/theme-fixes/hemingway/hemingway.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
( function( $ ) {
// Change all h5 elements in .post-nav to div.post-nav-type-label.
$( '.post-nav h5' ).each( function() {
$( this ).replaceWith( '<div class="post-nav-type-label">' + $( this ).html() + '</div>' );
} );
}( jQuery ) );
2 changes: 1 addition & 1 deletion wp-content/plugins/ari-fancy-lightbox/ari-fancy-lightbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: ARI Fancy Lightbox
Plugin URI: http://wp-quiz.ari-soft.com/plugins/wordpress-fancy-lightbox.html
Description: Full-featured lightbox plugin for WordPress.
Version: 1.3.11
Version: 1.3.12
Author: ARI Soft
Author URI: http://www.ari-soft.com
Text Domain: ari-fancy-lightbox
Expand Down
2 changes: 1 addition & 1 deletion wp-content/plugins/ari-fancy-lightbox/includes/defines.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
define( 'ARIFANCYLIGHTBOX_VERSION', '1.3.11' );
define( 'ARIFANCYLIGHTBOX_VERSION', '1.3.12' );
define( 'ARIFANCYLIGHTBOX_SLUG', 'ari-fancy-lightbox' );
define( 'ARIFANCYLIGHTBOX_ASSETS_URL', ARIFANCYLIGHTBOX_URL . 'assets/' );
define( 'ARIFANCYLIGHTBOX_VERSION_OPTION', 'ari_fancy_lightbox' );
Expand Down
4 changes: 2 additions & 2 deletions wp-content/plugins/ari-fancy-lightbox/libraries/arisoft/core/utils/class-priority-queue.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ public function __construct() {
$this->queue = new SplPriorityQueue;
}

public function count() {
public function count(): int {
return count( $this->queue );
}

public function insert( $data, $priority ) {
$this->queue->insert( $data, $priority );
}

public function getIterator() {
public function getIterator(): \Traversable {
return clone $this->queue;
}
}
8 changes: 6 additions & 2 deletions wp-content/plugins/ari-fancy-lightbox/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: arisoft
Donate link: http://wp-quiz.ari-soft.com/plugins/wordpress-fancy-lightbox.html
Tags: lightbox, fancybox3, popup, video lightbox, fancybox
Requires at least: 3.4
Tested up to: 6.2.2
Stable tag: 1.3.11
Tested up to: 6.3.1
Stable tag: 1.3.12
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -132,6 +132,10 @@ Sure, it is available [here](http://www.ari-soft.com/docs/wordpress/ari-fancy-li


== Changelog ==

= 1.3.12 =

* Better PHP 8.1+ support

= 1.3.11 =

Expand Down
4 changes: 2 additions & 2 deletions wp-content/plugins/bp-groupblog/1.5-abstraction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

if ( !function_exists( 'bp_core_admin_hook' ) ) :
function bp_core_admin_hook() {
// Groupblog requires multisite, so we don't need any more logic
// Groupblog requires multisite, so we don't need any more logic.
return apply_filters( 'bp_core_admin_hook', 'network_admin_menu' );
}
endif;
Expand Down Expand Up @@ -78,4 +78,4 @@ function bp_actions() {
add_action( 'wp', 'bp_actions', 1 );
endif;

?>
?>
Loading

0 comments on commit c4619a7

Please sign in to comment.