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

fix: Moved fonts to main assets folder #750

Merged
merged 5 commits into from
Dec 6, 2023

Conversation

zaronwald
Copy link
Contributor

@zaronwald zaronwald commented Nov 28, 2023

Pull Request Template

Description

At the request of wadekar9 I removed the current assets folder with just the fonts, and moved them into the src/assets/fonts folder to create less confusion for developers.

Fixes #726

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Checked application to ensure all fonts are still working as expected.

Checklist:

  • I have performed a self-review of my own code
  • I have commented on my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have tested in both Android and iOS platform
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@zaronwald
Copy link
Contributor Author

@muhsin-k can we merge this? Simple change for comprehension

@muhsin-k muhsin-k changed the title fix: Fixes 726 Moved fonts to main assets folder fix: Moved fonts to main assets folder Dec 6, 2023
@zaronwald
Copy link
Contributor Author

Thanks for reviewing @muhsin-k just need to merge now👍

@muhsin-k muhsin-k merged commit 175e029 into chatwoot:develop Dec 6, 2023
1 check passed
muhsin-k added a commit that referenced this pull request Dec 15, 2023
muhsin-k added a commit that referenced this pull request Dec 19, 2023
* chore: Bump version to 1.10.0 (#714)

* build: Version 1.10.1 (#715)

* chore: Bump semver from 5.7.1 to 5.7.2 (#717)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Bump word-wrap from 1.2.3 to 1.2.4 (#718)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Bump tough-cookie from 4.1.2 to 4.1.3 (#716)

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <[email protected]>

* feat: Refresh conversations and messages when the app start from the b.g (#720)

* fix: Attachment cropping in full screen (#721)

* fix: Sort messages by created date (#722)

* chore: enable herms in android (#724)

* chore: Stability improvements (#725)

* chore: Release iOS v1.10.7

* fix: Auto height issues in email messages (#727)

* chore: Translation updates (#729)

* chore: Bump activesupport from 6.1.7.3 to 6.1.7.6 (#728)

Bumps [activesupport](https://github.com/rails/rails) from 6.1.7.3 to 6.1.7.6.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.0.7.2/activesupport/CHANGELOG.md)
- [Commits](rails/rails@v6.1.7.3...v6.1.7.6)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Upgrade react native from `0.70.x` to `0.72.x` (#730)

* chore: upgrade all the packages to latest version

* chore: bumps node to 16.17.1

* chore: android/ios 1.10.13

* Update AndroidManifest.xml

* Update config.yml

* Update config.yml

* Update config.yml

* Update config.yml

* fix: change notification permission flow for android>32

* chore: add analytics event for FORGOT_PASSWORD

* chore: fix warnings

* fix: android share issues

* chore: fix attachment issues

* chore: android/ios 1.10.14

* fix: file upload issues in android

* fix: file upload issues in android

* chore: android/ios 1.10.15

* chore: android v1.10.16

* chore: bump node

* chore: Android v1.10.17

---------

Co-authored-by: Sojan Jose <[email protected]>

* chore: Upgrade minor packages (#733)

* fix: Non-serializable value update in auth slice (#735)

* chore: Bump `react-native-webview` (#736)

* chore: Upgrade rn web view

* Update Podfile.lock

* fix: Email message full body width (#737)

* fix: App is crashing when the label is added first time (#738)

* chore: Android/iOS v1.10.19

* chore: Bump react-devtools-core from 4.28.0 to 4.28.4 (#742)

Bumps [react-devtools-core](https://github.com/facebook/react/tree/HEAD/packages/react-devtools-core) from 4.28.0 to 4.28.4.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/react-devtools-core)

---
updated-dependencies:
- dependency-name: react-devtools-core
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Changes to include delivery reports for all channels (#745)

* feat: Add changes to include delivery reports for all channels

* chore: fixes

* chore: Bump @babel/traverse from 7.22.10 to 7.23.2 (#740)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.10 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <[email protected]>

* fix: package.json & yarn.lock to reduce vulnerabilities (#743)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-6032459

Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Muhsin Keloth <[email protected]>

* chore: Bump sharp from 0.32.5 to 0.32.6 (#746)

Bumps [sharp](https://github.com/lovell/sharp) from 0.32.5 to 0.32.6.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](lovell/sharp@v0.32.5...v0.32.6)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <[email protected]>

* core: Translation updates (#739)

* feat: Replace SectionList with Flashlist in chat screen (#747)

* chore: Replace SectionList with FlashList

* Update MessageList.js

* More cleanup

* Update conversationSlice.selector.js

* chore: fix padding issue

* Update MessageDeliveryStatus.js

* chore: Android/iOS v1.10.20

---------

Co-authored-by: iamsivin <[email protected]>

* feat: Add contact slice (#748)

* feat: Add contact slice

* minor fixes

* Android/iOS v1.10.21

* feat: Fix last message id logic in chat screen (#749)

* feat: Add contact slice

* minor fixes

* Android/iOS v1.10.21

* Android/iOS v1.10.22

* chore: Android/iOS v1.10.23

* chore: Android/iOS v1.10.25

* chore: Android/iOS v1.10.26

* fix: Moved fonts to main assets folder (#750)

* Moved fonts to main assets folder

* added for android linking

* added for ios manifest as well

* Revert "fix: Moved fonts to main assets folder (#750)"

This reverts commit 175e029.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Sivin Varghese <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chatwoot Bot <[email protected]>
Co-authored-by: Sojan Jose <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: iamsivin <[email protected]>
Co-authored-by: Zach Aronwald <[email protected]>
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.

Duplicate of assets folder
2 participants