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

Staging to dev #3350

Merged
merged 16 commits into from
Mar 18, 2024
Merged

Staging to dev #3350

merged 16 commits into from
Mar 18, 2024

Conversation

arthyn
Copy link
Member

@arthyn arthyn commented Mar 18, 2024

PR Checklist

  • Includes changes to desk files
  • Describes how you tested the PR locally (test ship vs livenet)
  • If a new feature, includes automated tests
  • Comments added anywhere logic may be confusing without context

arthyn and others added 16 commits March 7, 2024 10:52
@arthyn
ops: version bump
278d66a
@arthyn
Merge pull request #3318 from tloncorp/staging-5-8-0
40a4247 
ops: version bump and promote to staging
update glob: [skip actions]
31c973b
@jamesacklin
useAvatar: refactor to use react state
3ea97ae
@jamesacklin
GroupAvatar: redo showImage logic
ccf5d52
@jamesacklin
Avatar: fall back to sigil if image load fails
b1c5d94
@jamesacklin
MultiDMAvatar: fallback to PeopleIcon
7c3452c
@jamesacklin
Merge branch 'staging' into james/land-1691-groups-group-image-broken…
a352af6 
…-if-src-fails-to-load
@jamesacklin
Merge branch 'james/land-1691-groups-group-image-broken-if-src-fails-…
03cd458 
…to-load' of https://github.com/tloncorp/landscape-apps into james/land-1691-groups-group-image-broken-if-src-fails-to-load
@latter-bolden
avatar: fix check for avoiding comet & moon sigils
0d827dd
@jamesacklin
Merge pull request #3344 from tloncorp/james/land-1691-groups-group-i…
c9e2058 
…mage-broken-if-src-fails-to-load

web/tlon: proper fallbacks for broken-src image avatars (groups, ships, clubs)
update glob: [skip actions]
adaa307
@jamesacklin
Merge branch 'develop' into staging
1629c32
update glob: [skip actions]
d47bf28
@arthyn
Revert "Merge branch 'develop' into staging"
693488d 
This reverts commit 1629c32, reversing
changes made to adaa307.
@arthyn
Revert "Revert "Merge branch 'develop' into staging""
232b5e4 
This reverts commit 693488d.
@arthyn arthyn merged commit 4329781 into develop Mar 18, 2024
1 check passed
@arthyn arthyn deleted the staging-to-dev-3-18 branch March 18, 2024 22:56
latter-bolden added a commit that referenced this pull request Mar 19, 2024
@latter-bolden
Revert "Merge pull request #3350 from tloncorp/staging-to-dev-3-18"
e632e5d 
This reverts commit 4329781, reversing
changes made to 224837d.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@latter-bolden latter-bolden latter-bolden approved these changes

@patosullivan patosullivan Awaiting requested review from patosullivan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@arthyn @latter-bolden @jamesacklin