Skip to content

Commit

Permalink
Merge branch 'main' into feat/UI3DM-1907_add_bannerFreemium_Icon
Browse files Browse the repository at this point in the history
  • Loading branch information
nrmerlis authored Dec 17, 2024
2 parents 689ab4e + 881df9b commit 9c0eeb1
Show file tree
Hide file tree
Showing 30 changed files with 708 additions and 725 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [1.36.1](https://github.com/mParticle/aquarium/compare/v1.36.0...v1.36.1) (2024-12-06)

### Bug Fixes

- rename notification icons ([#508](https://github.com/mParticle/aquarium/issues/508)) ([98ea06f](https://github.com/mParticle/aquarium/commit/98ea06f1c0f66d7ca469f77158b1d4cf75cb8f6f))

# [1.36.0](https://github.com/mParticle/aquarium/compare/v1.35.0...v1.36.0) (2024-11-28)

### Bug Fixes

- typography component updates ([#497](https://github.com/mParticle/aquarium/issues/497)) ([d32d390](https://github.com/mParticle/aquarium/commit/d32d3900c3d89406a0f88bccd967ed356e8edfe5))

### Features

- add abSplit icon ([#499](https://github.com/mParticle/aquarium/issues/499)) ([8776f1c](https://github.com/mParticle/aquarium/commit/8776f1c2fced9cc75af92fb74960510b4e56833a))
- add notificationSubscriptions icon ([#505](https://github.com/mParticle/aquarium/issues/505)) ([b4976bc](https://github.com/mParticle/aquarium/commit/b4976bca3878813fadb453ff2426154b7fa1ef04))
- utilize generics in UserPreferencesService ([#504](https://github.com/mParticle/aquarium/issues/504)) ([4838a86](https://github.com/mParticle/aquarium/commit/4838a86929bd743f606688ceefeaf13ebf5b1f9d))

# [1.35.0](https://github.com/mParticle/aquarium/compare/v1.34.0...v1.35.0) (2024-11-15)

### Bug Fixes
Expand Down
84 changes: 58 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mparticle/aquarium",
"version": "1.35.0",
"version": "1.36.1",
"description": "mParticle Component Library",
"license": "Apache-2.0",
"keywords": [
Expand Down Expand Up @@ -52,6 +52,7 @@
"@types/multer": "1.4.12",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@vitejs/plugin-react": "4.2.1",
"@vitest/coverage-v8": "1.3.1",
"concurrently": "8.2.2",
"cz-conventional-changelog": "3.3.0",
"eslint": "8.56.0",
Expand Down
3 changes: 3 additions & 0 deletions src/assets/svg/crosshair.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/svg/mp_pm_lt_notification_subscribe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/mp_pm_lt_notification_subscribed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9c0eeb1

Please sign in to comment.