Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge in changes from upstream #4

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open

Merge in changes from upstream #4

wants to merge 93 commits into from

Conversation

bagofarms
Copy link

No description provided.

cjg89 and others added 30 commits April 30, 2021 09:31
@cjg89
Upgraded packages and re-ran gulp
8ca0e09
@cjg89
Merge branch 'packages' into rc-v0.7.2
6415cea
@cjg89
Merge branch 'rc-v0.7.2'
0983f06
@cjg89
Updated version number
1269965
@cjg89
Upgraded jquery and tether versions
ea6bbf8
@cjg89
Updated version number
a90dc06
@cjg89
Merge branch 'rc-v0.7.2'
7909704
@cjg89
Ported over media background video updates from main site theme
4f38780
@cjg89
load in fallback background images before background video element
33415e7
@cjg89
Removed now-used css
2ca0ae0
@cjg89
Fixed cookie name
675d6e9
@cjg89
Merge branch 'video-bgs' into rc-v0.7.3
298172b
@cjg89
Updated person post list layout to replace email addresses with short…
8436b88 
…ened email link; added phone and email icons if fontawesome is in use
@cjg89
Merge branch 'person-list-clipping' into rc-v0.7.3
60918dd
@rjucf
Added customizer option to include jquery in the header or footer.
97ecaae
@rjucf
Changed control from checkbox to radio
cdf54b7
@cjg89
Added support for wp_body_open action hook; deprecated after_body_open
bd7e8e8
@cjg89
Updated old after_body_open action hooks; fixed filter that should've…
1bf3ce2 
… been an action
@rjucf
Added description to the customizer option.
453c6d1
@rjucf
removed unnecessary default setting
08cb64a
@cjg89
Merge branch 'wp-body-open' into rc-v0.7.3
998e486
@rjucf
Merge pull request #117 from UCF/jquery-location
b04364b 
jQuery Location Setting
@cjg89
Upgraded packages; re-ran gulp
3e05fac
@cjg89
Merge branch 'packages' into rc-v0.7.3
61f55e5
@cjg89
Merge remote-tracking branch 'origin/rc-v0.7.3' into rc-v0.7.3
05c046b
@cjg89
Merge branch 'rc-v0.7.3'
5a8fbe9
@cjg89
Upgraded packages; re-ran gulp
5e1201d
@cjg89
Tidied up slash division usage
9a08d14
@cjg89
Unset underline on classic event times
3fcd378
@cjg89
Removed underline on modern event titles
1244cdc
jmbarne3 and others added 30 commits February 22, 2024 10:36
@jmbarne3
Updated athena to 1.3.0
328cdd7
@jmbarne3
Updated gulp packages
a9f86c3
@jmbarne3
Merge pull request #148 from UCF/athena-update
97bb827 
Updated athena to 1.3.0
@jmbarne3
Settings for webfonts removed
f8d0e08
@jmbarne3
Updated logic that used the webfont settings
415adaa
@jmbarne3
Corrected a syntax error
3ad6ca7
@jmbarne3
Merge pull request #149 from UCF/remove-type-settings
c55d7a6 
Removed typography settings
@jmbarne3
Bumped version number
b16dcd6
@jmbarne3
Upgraded athena-framework to 1.3.1
6955266
@jmbarne3
Merge pull request #150 from UCF/athena-patch-update
a541b9d 
Upgraded athena-framework to 1.3.1
@jmbarne3
Bumped version number
63a722d
@jmbarne3
Updated Athena-Framework to 1.3.2
5933add
@jmbarne3
Merge pull request #152 from UCF/another-athena-update
d1d843f 
Updated Athena-Framework to 1.3.2
@jmbarne3
Bumped version
4912760
@jmbarne3
Updated the function that adds the id to the UCF Header script tag
045d971
@jmbarne3
Added backwards compatibility
548fa19
@jmbarne3
Merge pull request #153 from UCF/hf-ucf-header
519eefe 
UCF Header Fix
@jmbarne3
Bumped version
11d6478
fa6 is compiling.
b34b291
update package was removed
389df7d
Font-awesome 6 was added to customizer. In order to use it, you shoul…
4eca407 
…d go to customizer panel and change the version to 6
version number modified.
9131c16
bug was fixed in gulpfile.js
286612b
empty space was removed.
293c9d9
debug function was removed.
1774d68
Trailing line.
9ef722f
@Ramin-Farhadi
Merge pull request #155 from UCF/font-awesome6-setup
9e88509 
Font awesome6 setup
v0.11.0
2ae14c1
fixed duplicated class attribute.
3c9f170
@Ramin-Farhadi
Merge pull request #156 from UCF/hf-404-page
a3b0f1a 
fixed duplicated class attribute.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@bagofarms @cjg89 @rjucf @jmbarne3 @mcatech @Ramin-Farhadi