monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 		2024-10-19 19:13:32 +02:00
..
__mocks__ Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
entrypoints Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 2024-09-12 20:05:08 +02:00
flavours [Glitch] Fix follow recommendation carrousel scrolling on RTL layouts 2024-10-14 20:11:29 +02:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
hooks Update directory page options to use URL params (#31977) 2024-09-19 15:34:08 +00:00
icons
…
images Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream 2024-08-22 22:09:10 +02:00
mastodon Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
material-icons Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
skins Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 2024-04-30 21:03:04 +02:00
styles Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
svg-icons Change zoom icon in web UI (#29683) 2024-09-20 09:42:02 +00:00
types Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00