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

chore: b17s1 merge staging into master #231

Merged
merged 137 commits into from
Feb 12, 2024
Merged

chore: b17s1 merge staging into master #231

merged 137 commits into from
Feb 12, 2024

Conversation

mcdurdin
Copy link
Member

@mcdurdin mcdurdin commented Feb 8, 2024 •
edited
Loading

mcdurdin and others added 30 commits April 1, 2021 07:47
@mcdurdin
fix: improve weight for searches
b314bf7 
Fixes #147.

The search results for 'german' would return a set of weights for
various language codes. 'de' had 5 weights and 'pdt-Latn' had 4, but
both had a match on the name 'German' because 'pdt-Latn' has an
alternate language name of 'German'. This meant that the actual result
returned was indeterminate -- they both had the same weight.

Summing the weights for each language tag match brought 'de' higher
in the match results (weight 60 vs 30).
@mcdurdin
Merge pull request #148 from keymanapp/fix/147-improve-weight-for-sea…
97acd58 
…rches

fix: improve weight for searches
@darcywong00
Merge pull request #168 from keymanapp/master-a16-s13
788a707 
chore: Merger master from Sprint A16S13 to staging
@mcdurdin
chore: add extra logging
3998885
@mcdurdin
Merge pull request #171 from keymanapp/chore/master-to-staging
ac71f82 
chore: merge master to staging
@darcywong00
Merge branch 'master' into chore/master-a17s2-staging
e833e5d
@darcywong00
Merge pull request #175 from keymanapp/chore/master-a17s2-staging
b0e5dd6 
chore: Merge master from Sprint a17s2 to staging
@darcywong00
chore: start Docker
acf9b66
@darcywong00
fix: image name and port number
8ccd049
@darcywong00
fix: Add Full-Text search
f1f967f
@darcywong00
fix: Update configure step
3e3cc13
@darcywong00
test: Move configure step
ef069ad
@darcywong00
chore: Set build.sh executable
b98cfab
@darcywong00
start .htaccess file
69de1c0
@darcywong00
test: engineering toggles for DB and site
750e7d6
@darcywong00
chore: check in updates from rubberducky
eb55ca6
@darcywong00
fix: Continue to work on installing SQL drivers
a1d291d
@darcywong00
Merge remote-tracking branch 'origin/master' into chore/master-a17s6-…
466d1f8 
…staging
@darcywong00
consolidate start blocks
493ce8c
@darcywong00
Merge pull request #179 from keymanapp/chore/master-a17s6-staging
6850927 
chore: Merge master end of Sprint A17S6 to staging
@darcywong00
Merge remote-tracking branch 'origin/staging' into chore/start-docker
9c2593f
@darcywong00
try to separate pecl install
1017398
@darcywong00
check in rubber ducky
193f691
@darcywong00
install zip
f313281
@darcywong00
revert to mssql-server-2019
2f1a11c
@darcywong00
chore: cleanup commented code
89dfa77
@darcywong00
fix: namespace pathing for Linux
8e2aa0d
@darcywong00
split Dockerfile in 2
8c28bc2
@darcywong00
chore: Update builder.inc.sh from A17S7
047b15e
@darcywong00
chore: Split :db and :app targets
07abeca
darcywong00 and others added 12 commits January 26, 2024 13:49
@darcywong00
chore: Add /_control/ready
053345e
@darcywong00
fix: query
0dbccf2
@darcywong00
chore: cleanup unused search.inc.php
51246ff
@darcywong00
Merge pull request #223 from keymanapp/chore/ready
f9a0a78 
chore: Add /_control/ready
@darcywong00
fix: _control/ready
b7e9ef6 
Some files are on the db container instead of app
@darcywong00
Merge pull request #224 from keymanapp/fix/ready-on-app
a4a2d48 
fix: _control/ready
@darcywong00
Update staging to use shared-sites v0.4
c65524b
@darcywong00
Merge pull request #225 from keymanapp/staging-use-v04
8e6609a 
Update staging to use shared-sites v0.4
@darcywong00
chore: Remove unused comments in .htaccess
f76709e
@darcywong00
Merge pull request #228 from keymanapp/chore/cleanup-htaccess
1dc8c06 
chore: Remove unused comments in .htaccess
@mcdurdin
chore: disable php-based webhook in .htaccess
407c284
@mcdurdin
Merge pull request #229 from keymanapp/chore/disable-php-based-webhook
0b468e6 
chore: disable php-based webhook in .htaccess
@mcdurdin mcdurdin added the chore label Feb 8, 2024
@mcdurdin mcdurdin added this to the B17S1 milestone Feb 8, 2024
This was referenced Feb 8, 2024
Merged
Merged
Merged
Merged
darcywong00
darcywong00 previously approved these changes Feb 8, 2024
View reviewed changes
Copy link
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rslgtm

@darcywong00 darcywong00 mentioned this pull request Feb 9, 2024
Closed
37 tasks
@darcywong00 darcywong00 dismissed their stale review February 12, 2024 04:43

Will want to 🍒 pick #234

darcywong00
darcywong00 approved these changes Feb 12, 2024
View reviewed changes
Copy link
Contributor

@darcywong00 darcywong00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mcdurdin mcdurdin merged commit be8a340 into master Feb 12, 2024
3 checks passed
@mcdurdin mcdurdin deleted the chore/b17s1-merge-staging-into-master branch February 12, 2024 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darcywong00 darcywong00 darcywong00 approved these changes

Assignees
No one assigned
Labels
chore
Projects
None yet
Milestone
B17S1
Development

Successfully merging this pull request may close these issues.
3 participants
@mcdurdin @darcywong00 @tim-eves