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

Update master with dev/1.1.x #1545

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

Update master with dev/1.1.x #1545

wants to merge 422 commits into from
+17,479 −25,031

Conversation

chiatt
Copy link
Member

@chiatt chiatt commented Jan 18, 2024

Update master with dev/1.1.x

njkim and others added 30 commits October 13, 2023 12:03
@njkim
Check the obervation ids before request, #1337
72fe3a1
@chiatt
Merge pull request #1340 from archesproject/1332_new_project_name
a935901 
Fix the logic to save text (prj name), #1332
@njkim
Add file format settings to treat formats other than and 'txt' as tex…
c3c2ad0 
…t files, #1329 (#1348)
@jacobtylerwalls
Merge pull request #1355 from archesproject/1337_project_report_no_ob…
d23f7b6 
…servation

The project report no observation, #1337
@jacobtylerwalls
Fix highlighting of resource instances #1356 (#1357)
58bde21 
Regression in 3e3bd2a.
@chrabyrd
adds incomplete workflows modal to init-workflow plugin #1364
988d640
@chrabyrd
nit #1364
08c0fcc
@njkim
Assign "" for missing values, #1342 (#1362)
6cd1696
@chrabyrd
Merge branch 'dev/1.1.x' of https://github.com/archesproject/arches-f…
2607fb3 
…or-science into 1364-cbyrd-list-user-incomplete-workflows
@chrabyrd
PR feedback changes #1364
aafa972
@chrabyrd
nit 1364
e4c9d57
@jacobtylerwalls
Merge pull request #1369 from archesproject/1364-cbyrd-list-user-inco…
f2bb85b 
…mplete-workflows

adds incomplete workflows modal to init-workflow plugin #1364
@jacobtylerwalls
Open downloaded files in a new tab #1339
2370b83
@jacobtylerwalls
Fix typo
12ccce1
@jacobtylerwalls
Update README with settings and url tweaks (#1375)
14de8d0 
* Update README with settings and url tweaks

* [README] Fix typos re #1373

* [skip ci] add cantaloupe note re #1373
@njkim @chiatt
Handle when there is no custom renderer, #1352 (#1358)
b5fa941 
* Hanlde no custom renderer, #1352

* nit

---------

Co-authored-by: Cyrus Hiatt <[email protected]>
@jacobtylerwalls
Prevent annotations from vanishing when toggling or canceling #1321 (#…
7d8da5b 
…1359)

* Prevent annotations from vanishing when toggling or canceling #1321

Before, upon creating n>=2 analysis area annotations, two scenarios
caused a shape to vanish from the canvas (but not from the sidebar).

1 - Click twice on feature 1 to get edit controls. Deselect it.
Result: feature 1 disappears

2 - With feature 2 selected, click Cancel.
Result: feature 2 disappears

* Remove wide catch re #1321

During development this wide catch was swallowing
JS errors rather than hypothetical server errors, failing
with `response.json is not a function`.
@njkim
Remove temp_file from afs, arches#9749 (#1361)
746df33
@jacobtylerwalls
Add migration granting Resource Reviewers view plugin access (#1366)
583c40f
@chiatt
Remove references to FORMATS setting, re #1380 (#1381)
2ad0980
@jacobtylerwalls
Bump arches-templating to 0.1.2
3faea2f
@jacobtylerwalls
Allow filtering samples and regions out of search results #1378
6c7b557
@jacobtylerwalls
nit re #1304
789cf0a
@jacobtylerwalls
Add toggles re #1305
9236909
@jacobtylerwalls
Sort selected resources
5523702
@jacobtylerwalls
Fix wrapping of phys thing name in sidebar
785757a
@jacobtylerwalls
Group child physical things under parents re #1378
822b5e5
@jacobtylerwalls
Indent child physical things in sidebar #1378
1729bd9
@aarongundel
fixes for #1328 and #1382 (#1384)
93b5774 
* fixes for #1328 and #1382

* revert regex change

* fix alerting

* fix race condition

* fixes issue with file interpretation step

* fixes extra it
@chiatt
Update version to latest alpha (#1389)
dc95ae3
aarongundel and others added 30 commits February 6, 2024 09:47
@aarongundel @chiatt
purges keys that are used as untranslated text
e2bb18b
@aarongundel @chiatt
finish with physical thing updates
cf9f3f2
@chiatt
Version and dependency changes for 1.1.0a3 release (#1549)
d31a3fd 
* Update alpha release version

* Ensure alpha release uses correct arches js dependencies
@jacobtylerwalls
Prevent crash when reverse migrating 0004 (#1551)
19dd6ac
@jacobtylerwalls
Avoid lazy strings in initial migration (#1552)
695f293 
Lazy strings make sense for user-facing help texts, etc., but not
when running initial migrations.
@ekansa @chiatt
Update create-project-workflow-help.htm
d0fc4d7
@ekansa @chiatt
Removed overflow style
e58bf2f
@ekansa @chiatt
Update project-collection-workflow-help.htm
32b8d44
@ekansa @chiatt
Update project-report-workflow-help.htm
8b4238f
@ekansa @chiatt
Fixed outcome paragraph
65c85b1
@ekansa @chiatt
Update outcomes in project-collection-workflow-help.htm
721c0c0
@ekansa @chiatt
Update sample-taking-workflow-help.htm
23c5bb2
@ekansa @chiatt
Update tab consistency create-project-workflow-help.htm
231fe3a
@ekansa @chiatt
Update tab consistency project-collection-workflow-help.htm
e9e0d51
@ekansa @chiatt
Update analysis-areas-workflow-help.htm
b6da81f
@ekansa @chiatt
Update upload-dataset-workflow-help.htm
097521f
@ekansa @chiatt
Update review-dataset-workflow-help.htm
3819186
@ekansa @chiatt
Update chemical-analysis-workflow-help.htm
aa4824c
@ekansa @chiatt
Update add-chemical-analysis-images-workflow-help.htm
f3e2111
@jacobtylerwalls @chiatt
Fix string lookup for "TimeSpan"
d16d9eb
@jacobtylerwalls @chiatt
Lint backend
fabb650
@jacobtylerwalls @chiatt
Fix issues found by pylint
5d5cce5
@jacobtylerwalls @chiatt
Move linting config to pyproject.toml
2832347
@aarongundel @chiatt
upgrade the config for s3 to use sigv4 for uppy endpoint
3217e9c
@aarongundel @chiatt
change inheritance for boto config
9e95211
@chiatt
Update version to 1.1.0a4
da5337c
@chiatt
Prevent display of heading when related workflows are not visible #1547
90f0109
@aarongundel
Merge pull request #1563 from archesproject/chem_analysis_heading_1547
ba547c1 
Prevent display of heading when related workflows are not visible #1547
@jacobtylerwalls @chiatt
Remove compressor from INSTALLED_APPS in test_settings
00c90d7
@jacobtylerwalls @chiatt
Fix used-before-assignment in ManifestXCanvasView
2b1cc49
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.
10 participants
@chiatt @njkim @jacobtylerwalls @chrabyrd @aarongundel @dwuthrich @johnatawnclementawn @apeters @ryan86 @ekansa