Commit graph

6 commits

Author SHA1 Message Date
thororen1234
f8879cc801 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	eslint.config.mjs
#	package.json
#	pnpm-lock.yaml
#	src/components/PluginSettings/index.tsx
#	src/plugins/imageZoom/index.tsx
#	src/plugins/messageLogger/index.tsx
#	src/plugins/pictureInPicture/index.tsx
#	src/plugins/serverInfo/GuildInfoModal.tsx
#	src/plugins/whoReacted/index.tsx
2025-01-04 17:57:05 -05:00
thororen1234
026d39aef2 Add back ServerSearch & DeadMembers 2024-10-03 10:49:35 -04:00
thororen1234
c4ba86345b Fixes For Canary 2024-09-25 16:40:37 -04:00
pan
6398dbd716
fix: background-primary (#30)
* feat: plugin information in plugins tab

* feat(equicordCSS): remove if hell and simplify

* feat(Demonstration): notif reminder

* fix(Demonstration): improvement

* add devs

* Updates And Fixes

* Revert "Updates And Fixes"

This reverts commit d84b833bc4.

* feat(ServerListIndicators): toggle compact and optimization

* fix: background-primary

---------

Co-authored-by: thororen1234 <78185467+thororen1234@users.noreply.github.com>
2024-08-06 12:31:03 -04:00
pan
f0aed6c3e2
update(serverSearch) patches -> ServerList API (#11)
* feat(ServerListIndicator) add ids for css

* feat: consistency

* feat(SpotifyControls): dummy color control

* fix: resolve merge

* Revert "feat(SpotifyControls): dummy color control"

This reverts commit 3a38e02679.

* fix(ServerListIndicators): tooltip changes on mode

* fix(SpotifyControls): copy paste from source to sync

* fix: edit DiscordColorways to ServerListRenderPosition.Above

* Update index.tsx

* update(serverSearch): patches -> ServerList api

---------

Co-authored-by: thororen <78185467+thororen1234@users.noreply.github.com>
2024-07-17 12:27:14 -04:00
thororen1234
d99f5aa28a ServerSearch 2024-06-24 15:04:44 -04:00