Skip to content

Merge develop to main#410

Merged
cnbennett3 merged 62 commits into
masterfrom
develop
May 21, 2026
Merged

Merge develop to main#410
cnbennett3 merged 62 commits into
masterfrom
develop

Conversation

@cnbennett3
Copy link
Copy Markdown
Contributor

@cnbennett3 cnbennett3 commented May 21, 2026

Describe your changes

Merge develop to main.

General Best Practice

  • [X ] I have performed a self-review of my code
  • If it is a core feature, I have added thorough tests
  • I have updated the documentation and README where necessary

Secure Software Development

frostyfan109 and others added 30 commits October 13, 2025 15:30
@frostyfan109
Create a deprecation notice in /home/shared when the /shared mount ex…
dfdc444 
…ists.
@frostyfan109
add initcontainer for trash functionality
a24b77b
@frostyfan109
fix syntax issue and remove unused vars
063f404
@frostyfan109
fix yaml syntax
90be55c
@frostyfan109
fix location of deprecation notice
666c6d2
@frostyfan109
update initcontainer to assume trash bins on volumes already exist.
f410ab9
@frostyfan109
update trash naming
9e387bf
@frostyfan109
replace trash_enabled_cli flag with detection
1504cfa
@frostyfan109
move init container enable flag back outside
ed731c3
@frostyfan109
add back user-owned mkdir on /home/shared
0d6f9df
@PhillipsOwen
Startup issue when configuring the color scheme. fix suggested by GR.
e79dfa3
@frostyfan109
fix port on csrf trusted origins
04687d4
@PhillipsOwen
improving message comment
da3da2f
@PhillipsOwen
adding CILogon
2fc11de
@PhillipsOwen
adding override to see what social accounts are returning for data.
305e12c
@PhillipsOwen
tidying up, correcting spelling mistake.
c39fe62
@frostyfan109
add automatic trash creation
cb09c3f
@PhillipsOwen
adding config items for dex auth
72df14e
@frostyfan109
add oidc dex config
a02af71
@PhillipsOwen
Merge branch 'issue_396' of https://github.com/helxplatform/appstore …
4a170d8 
…into issue_396

# Conflicts:
#	appstore/appstore/settings/base.py
@frostyfan109
fix providers endpoint, move openid_connect installation
15d5124
@PhillipsOwen
Merge branch 'issue_396' of https://github.com/helxplatform/appstore …
e6e9ea4 
…into issue_396
@frostyfan109
extract values into chart config
bb1b368
@frostyfan109
update whitelist required URL
2b27805
@PhillipsOwen
Merge branch 'issue_396' of https://github.com/helxplatform/appstore …
00e9c29 
…into issue_396
@frostyfan109
remove irods mount from trash setup container
b1653d2
@frostyfan109
Merge pull request #395 from helxplatform/trash-init-container
6fbc5dc 
Trash init container
@frostyfan109
remove deprecated gitea functionality
6136e3b
@frostyfan109
add gitea link to ui navbar if provided
991b39c
@frostyfan109
Merge pull request #398 from helxplatform/fix_csrf-trusted-origin
94832c7 
fix port for csrf trusted origins
PhillipsOwen and others added 24 commits February 20, 2026 15:01
@PhillipsOwen
addressing all items in ASAR-82
034418e
@PhillipsOwen
comment update
2711985
@PhillipsOwen
removing json formatter
72fda87
@PhillipsOwen
updating python package requirements
cd1960c
@PhillipsOwen
restoring json log output
94ebabb
@PhillipsOwen
restoring requirements file
dd242b8
@PhillipsOwen
restoring requirements and base.py files
88c3145
@PhillipsOwen
restoring base.py files, adding new files
32bb482
@PhillipsOwen
Merge pull request #397 from helxplatform/issue_396
d0b4adb 
Implementation of CILogon and Dex OIDC authentication sources.
@PhillipsOwen
Merge branch 'develop' of https://github.com/helxplatform/appstore in…
9c5fc8d 
…to ASAR-82
@PhillipsOwen
Merge pull request #402 from helxplatform/ASAR-82
4905c06 
ASAR-82 - Logging enhancements
@frostyfan109
Merge pull request #399 from helxplatform/ordrd-gitea
5803ac5 
Gitea soft integration
@frostyfan109
add ai sandbox brand
8af03de
@frostyfan109
fix image logo path
be72644
@frostyfan109
add static ai sandbox logo
4481385
@frostyfan109
add banner asset
40ff013
@frostyfan109
crop transparent region out of banner image
aa77385
@frostyfan109
Merge pull request #403 from helxplatform/ASAR-138/sandbox-branding
892ad63 
Add branding for AI Sandbox
@frostyfan109
Fix whitelisting bug that automatically authorizes users with empty e…
b6ffbdd 
…mails
@frostyfan109
Merge pull request #405 from helxplatform/ASAR-145/whitelist-fix
3108cd6 
Whitelisting fix for empty emails
@frostyfan109
add pgappname automatically
e794da2
@frostyfan109
add arbitrary product link support
1a7babb
@frostyfan109
Merge pull request #408 from helxplatform/CDDP-125/pgappname
e6b1e49 
Add pgappname to apps automatically
@frostyfan109
Merge pull request #409 from helxplatform/product-links
57f6cd0 
Custom product links support
@cnbennett3 cnbennett3 merged commit 295fe19 into master May 21, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@frostyfan109 frostyfan109 frostyfan109 approved these changes

@joshua-seals joshua-seals joshua-seals approved these changes

@pj-linebaugh pj-linebaugh Awaiting requested review from pj-linebaugh

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cnbennett3 @frostyfan109 @joshua-seals @PhillipsOwen