Skip to content

Feat/test framework merged #777

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
Merged
merged 122 commits into from
Mar 12, 2025
Merged

Feat/test framework merged #777

merged 122 commits into from
Mar 12, 2025

Conversation

chreman
Copy link
Member

@chreman chreman commented Mar 5, 2025

Resolution of merge conflicts.

  • This PR is intended to resolve merge conflicts between feat/test-framework with the visconnect-prototype-biography-and-mentoring working branch.

Alexandra Shubenko and others added 30 commits November 15, 2023 12:49
add condition to searchBASE.php
1b8ee7c
add condition to searchBASE.php about exclude_date_filters
67622b1
@chreman
backend changes for exclude_date_filters param
fd61571
@chreman
backend changes for exclude_date_filters param
7a649eb
@chreman
backend changes for exclude_date_filters param
27e6df8
@chreman
restructure local docker env
0a4bc10
@chreman
cleanup
180d34a
@chreman
deployment bugfix
6aac924
@chreman
deployment bugfix
0c1dabf
hide timeframe from contextLine if excludedDateFilters is true
3b7e247
hide timeframe from contextLine if excludedDateFilters is true
56c94d0
hide timeframe from contextLine if excludedDateFilters is true
910a088
hide timeframe from contextLine if excludedDateFilters is true
8638ae6
hide timeframe from contextLine if excludedDateFilters is true
ac488f3
@chreman
Merge branch 'docker-env-rework' into exclude-date-filters-param
ce14236
@chreman
Merge remote-tracking branch 'upstream/exclude-date-filters-param' in…
97ef85b 
…to exclude-date-filters-param
error log fixes
91659e2
@chreman
update request validation; some lgging cleanup
8b1f0db
@chreman
bugfix
d07d6ff
@chreman
bugfix
6d0fc29
@chreman
bugfix
9e24a75
@chreman
bugfix
a0ac7e1
add sanitize_year
2284f50
cleanup prints and logs
ee81bfb
@chreman
dependency updates
353af2f
@chreman
Merge remote-tracking branch 'upstream/exclude-date-filters-param' in…
4f24766 
…to exclude-date-filters-param
@chreman
Merge remote-tracking branch 'upstream/master' into exclude-date-filt…
3b215f5 
…ers-param
@chreman
ID creation bugfix
489be17
@chreman
handle additional date formats
258bc00
@chreman
streamgraph no pubdate failsafe
b0f84c0
chreman and others added 25 commits February 2, 2025 14:55
@chreman
Update search.php
6e44cee
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
49b9594 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@chreman
untrack env file
6b6cb38
@modsen-hedgehog
fix: dropdown positioning
3905acc
@chreman
revert dev env parameter
cbcff1d
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
765646b 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@modsen-hedgehog
fix: pubmed citations
2e979d5
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
bce7d55 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@modsen-hedgehog
fix: headstart bugs before release
acaf425
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
5eb2778 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@modsen-hedgehog
fix: citation sorting
0818bbf
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
3292aec 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@modsen-hedgehog
fix: paper
31f54f0
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
ad412b3 
…-and-mentoring' into visconnect-prototype-biography-and-mentoring
@chreman
vis_id bugfix BASE
d5562b0
@chreman
Merge remote-tracking branch 'upstream/master' into visconnect-protot…
f883813 
…ype-biography-and-mentoring
@chreman
vis_id bugfix BASE
6e921da
@chreman
fix bug in cite knowledge map modal
1a3bd94
@chreman
increase timeouts
656f3a6
@andreishket
bugfix: project setup debugging
b7c08a2
@chreman
local dev deployment updates
fb42896
@andreishket
refactor: move script that checks config.js to separate file
c6a79ff
@andreishket
feat: script that checks and creates .htaccess file
a79f3be
@chreman
Merge pull request #776 from OpenKnowledgeMaps/deployment-bugfixes
848127f 
Deployment bugfixes
@chreman
Merge remote-tracking branch 'upstream/visconnect-prototype-biography…
c604560 
…-and-mentoring' into feat/test-framework
@andreishket andreishket merged commit 8af863b into feat/test-framework Mar 12, 2025
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@chreman chreman

@andreishket andreishket

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chreman @andreishket @modsen-hedgehog