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.

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

chore: merge develop to firefly-rp #11404

Merged
merged 50 commits into from Feb 19, 2024
Merged

chore: merge develop to firefly-rp #11404

merged 50 commits into from Feb 19, 2024

Conversation

guanbinrui
Copy link
Member

Description

Closes MF-0000

Type of change

  • Documentation
  • Code refactoring (Restructuring existing code w/o changing its observable behavior)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (a fix or feature that would make something no longer possible to do/require old user must upgrade their Mask Network to this new version)

Previews

Checklist

  • My code follows the style guidelines of this project.
  • I have performed a self-review of my own code.
    • I have removed all in development console.logs
    • I have removed all commented code.
  • I have commented on my code, particularly in hard-to-understand areas.
  • I have read Internationalization Guide and moved text fields to the i18n JSON file.

If this PR depends on external APIs:

  • I have configured those APIs with CORS headers to let extension requests get passed.
    • chrome extension: chrome-extension://[id]
    • firefox extension: moz-extension://[id]
  • I have delegated all web requests to the background service via the internal RPC bridge.

Jack-Works and others added 30 commits January 23, 2024 18:07
Co-authored-by: Jack Works <jackworks@protonmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* fix: mf-5996 should paste into compose dialog when it's open

* fix: mf-5996 back to compose dialog with correct compositionType
* Revert "fix: mf-6007 remove friend tech from application board (#11312)"

This reverts commit 106717b.

* fix: remove app icon from application board only
* fix: mf-6009 resend redpacket from history with password

* fix: nft redpacket

* fix: fixup
* chore: remove app/

* chore: remove ShareSelectNetworkModal

* chore: remove ProfileTab

* chore: remove SearchResultInspector

* chore: remove hooks

* chore: update lock file

* chore: remove tsconfig

* chore: update build script

* chore: renaming

* chore: update knip config

* chore: remove EnhanceableSite.App
@guanbinrui guanbinrui added this to the 2.25.0 milestone Feb 18, 2024
@guanbinrui guanbinrui changed the title chore: merge develop chore: merge develop to firefly-rp Feb 18, 2024
@guanbinrui guanbinrui marked this pull request as ready for review February 18, 2024 10:31
@guanbinrui guanbinrui merged commit 0c66f86 into firefly-rp Feb 19, 2024
3 of 4 checks passed
@guanbinrui guanbinrui deleted the chore/merge-develop branch February 19, 2024 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants