Conflict investigation - #230

Closed

matt-bernhardt wants to merge 44 commits into

Commits on Aug 31, 2026

Hero image block with editable h1 and search widget area

djanelle-mit
authored and
matt-bernhardt
committed
c124fe2
Tweaks to hero block and scaffold for hours

djanelle-mit
authored and
matt-bernhardt
committed
53359a5
Using the libraries block

djanelle-mit
authored and
matt-bernhardt
committed
8b4d1e4
First drafts of Featured and Featured collections blocks

djanelle-mit
authored and
matt-bernhardt
committed
8f3991b
updated plugins

djanelle-mit
authored and
matt-bernhardt
committed
6c02733
Updated hours plugin for basic editing

djanelle-mit
authored and
matt-bernhardt
committed
17aec28
Tweaked editing display of hours plugin

djanelle-mit
authored and
matt-bernhardt
committed
37afeca
Updated using the libraries section to have basic editing

djanelle-mit
authored and
matt-bernhardt
committed
55f12a6
Updating names, featured block editing, and icons

djanelle-mit
authored and
matt-bernhardt
committed
6f2b903
Collapse .editorconfig
matt-bernhardt
committed
08b9f0a
Streamline NPM tooling
matt-bernhardt
committed
34664ed
Add new CI workflow to check for build status
matt-bernhardt
committed
76a9b2d
re-run build
matt-bernhardt
committed
86c6e20

Commits on Sep 3, 2026

Move hours block plugin into existing plugin
matt-bernhardt
committed
bf8abe2
Updating block materials from code review
matt-bernhardt
committed
f921e97
Update CI
matt-bernhardt
committed
c1180e4
Re-run build
matt-bernhardt
committed
f5434b5

Commits on Sep 4, 2026

Conditional rendering for when page content is empty
djanelle-mit
committed
6e6b9cc
Updated featured librarian in featured block content

djanelle-mit
authored and
matt-bernhardt
committed
2b2e486

Commits on Sep 8, 2026

First draft of single blocks plugin
djanelle-mit
committed
8d47326
Merge pull request #220 from MITLibraries/single-block-plugin
djanelle-mit
authored
2771ec7
Rename src/ to blocks/ in mitlib-blocks
matt-bernhardt
committed
aa9900b
Move hours block into new plugin
matt-bernhardt
committed
776915a
Cleaning up after block rehoming
matt-bernhardt
committed
12ec026
Re-run build
matt-bernhardt
committed
833c95f

Commits on Sep 9, 2026

Merge pull request #221 from MITLibraries/hours-block
matt-bernhardt
authored
3acb7db
First draft select a featured librarian
djanelle-mit
committed
de0a102
Casting ID as int
djanelle-mit
committed
a9aded2

Commits on Sep 11, 2026

Commits on Sep 14, 2026

Merge pull request #224 from MITLibraries/featured-staff
djanelle-mit
authored
2e3345c
Remove unused view.js
matt-bernhardt
committed
f219c89
Remove "main" entry from package.json
matt-bernhardt
committed
3a78843
Declare dependencies with versions
matt-bernhardt
committed
87f6238
npm run format
matt-bernhardt
committed
07e3c2e
replace class with className in javascript files
matt-bernhardt
committed
e1b39dd
Use HTML entities rather than bare characters
matt-bernhardt
committed
c57021d
Remove useBlockProps
matt-bernhardt
committed
dfb3a3a
Remove __ import
matt-bernhardt
committed
d1922fe
composer lint web/app/plugins/mitlib-blocks
matt-bernhardt
committed
d30df79
Update package-lock.json
matt-bernhardt
committed
460674c
Re-run build
matt-bernhardt
committed
bb20d8f
Updated default content for v2 home template
matt-bernhardt
committed
81cbfd9
Fix indenting 1/n
matt-bernhardt
committed
0b7e627