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

7.6 -> master #11514

Merged
merged 962 commits into from
Oct 7, 2024
Merged

7.6 -> master #11514

merged 962 commits into from
Oct 7, 2024

Conversation

jacobtylerwalls
Copy link
Member

No description provided.

whatisgalen and others added 30 commits August 21, 2024 16:07
@whatisgalen
rm unused imports, consolidate models imports, re #10804
6aa5c2c
@jacobtylerwalls
Expose python test runner and test utils #11335 (#11359)
d1fda8f 
Previously, this relied on templating at the project level.
@apeters
Merge pull request #10807 from archesproject/10804_componentizing_cor…
be8d9f5 
…e_search

10804 componentizing core search
@whatisgalen
Merge pull request #11349 from archesproject/jtw/ready-error
5d7a31d 
Improve manual reconciliation signposting in updateproject #11348
@njkim
Add concept edit preview test, #11117
74237a3
@njkim
Fix formatting, #111117
9baa335
@njkim
Merge branch 'dev/7.6.x' into 11117_bulk_concept_editor
694e260
@njkim
Fix migrations, #11117
89efcd8
@jacobtylerwalls
Flesh out release note re #11304
1a573e5
@jacobtylerwalls
Move manage.py migrate in upgrade steps #11305
ea9cd7f
@njkim
Handle the errorin test, #11117
edac600
@njkim
nit, #11117
418e593
@njkim
Fix format, #11117
fbc5077
@whatisgalen
return dsl unserialized, re #11386
12c0159
@whatisgalen
fix merge conflict with latest, clean up logic, re #10816
5f6717d
@whatisgalen
create test for returnDsl, re #11386
836ef36
@jacobtylerwalls
Remove outermost __init__.py #11388
df10522
@whatisgalen
dont directly return dsl until search_results finishes handle_search_…
3b7b362 
…results_query, re #11386
@whatisgalen
set default of None for search_query_object.pop(query) in returnDsl, re
253a01e 
#11386
@whatisgalen
rm unneeded test for feature-less map-filter req, refactor get_respon…
ede08dd 
…se_json into utils, re #10816
@whatisgalen
refactor get_response_json into utils, change kwarg names in search_t…
ae1adfb 
…ests, re #10816
@whatisgalen
refactor req.GET.get(componentname) -> querystring in search-filters,…
6c47b0d 
… re #11390
@whatisgalen
clear filter geoms every time filterByFeatureGeom called, re #10816
aa2fba0
@njkim
Update for update parent class, #11117
59d42c2
@njkim
Pass the user using search_results, #11117
bb0429d
@njkim
Merge pull request #11387 from archesproject/11386_dsl_unserialized
f67721f 
return dsl unserialized, re #11386
@njkim
Fix formatting, #11117
b0320f6
@njkim
Merge branch 'dev/7.6.x' into 11117_bulk_concept_editor
3cc60cf
@njkim
Add more test, #11117
dcfd00b
@aarongundel @chiatt
adds hooks
d77218e
chiatt and others added 22 commits September 26, 2024 10:36
@chiatt
get_or_create creates invalid record when changing widgetid as widget…
c6abc2a 
…id is used as part of the identifier
@chiatt
Update changelog
25b6d9c
@chiatt
Format
4e91d73
@chiatt
Give django a little time between calling the same save endpoint
d98b840
@chiatt
update_or_create fixes issue without throttling request
b23ec43
@chiatt
Add db index to edit_log resourceinstanceid column (#11500)
9dbd62f
@chiatt
Prevent failed popup when clicking search result marker in default de…
54af0c5 
…ny (#11503)
@chiatt
Copy sample_index.py to project during updateproject
d1d0c4f
@chiatt
format
9053df6
@chiatt @jacobtylerwalls
Standardize json samples and remove trailing comma
b38c91d
@chiatt @jacobtylerwalls
Make uninstall of yarn optional
ee9bc19
@chiatt @jacobtylerwalls
Update version
c0d677e
@chiatt @jacobtylerwalls
Migrate before updateproject so updateproject publishes migrated graphs
4b14df4
@chiatt @jacobtylerwalls
Standardize format of changelog
575e966
@chiatt @jacobtylerwalls
Fix step order
e8bd51c
@chiatt @jacobtylerwalls
Update releases/7.6.0.md
e29bf71 
Co-authored-by: Jacob Walls <[email protected]>
@chiatt @jacobtylerwalls
Update releases/7.6.0.md
d7a807d 
Co-authored-by: Jacob Walls <[email protected]>
@chiatt @jacobtylerwalls
Fix capitalization of 'When'
3553645
@chiatt @jacobtylerwalls
Move datatype announcement to highlights
7a14a1c
@chiatt @jacobtylerwalls
Instruct user to activate venv before migrate
0236843
@chiatt @jacobtylerwalls
Scan only 'tests' when running project tests
c4b784b
@chiatt
Indicate if user has no etl module permissions (#11506)
de7d083 
* Inform user in UI if they have no etl module permissions

* Provide means of updating etl module permissions in bulk

* format

* Use stderr instead of print

* Remove cruft string

* Update docstring with command example

* Fix typo
johnatawnclementawn
johnatawnclementawn approved these changes Oct 7, 2024
View reviewed changes
Copy link
Member

@johnatawnclementawn johnatawnclementawn left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼

@jacobtylerwalls jacobtylerwalls merged commit 71ce342 into master Oct 7, 2024
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnatawnclementawn johnatawnclementawn johnatawnclementawn approved these changes

Assignees

@johnatawnclementawn johnatawnclementawn

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.