djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 09:04:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,048 Commits 69 Branches 20 Tags 372 MiB
395b9011ee
Commit Graph

7615 Commits

Author SHA1 Message Date
Claire
395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Marcin Mikołajczak
f0dba9af6f [Glitch] LanguageDropdown: remove unused function 
Port a243963e93 to glitch-soc

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 18:22:00 +02:00
Claire
8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's different theming system.
  Ported upstream's change.
 2024-06-17 18:14:14 +02:00
github-actions[bot]
35d52d7914
New Crowdin Translations (automated) (#30723) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-17 12:13:23 +00:00
Eugen Rochko
fd3697723c [Glitch] Add author links on the explore page in web UI 
Port ed6d24330b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 14:08:08 +02:00
Eugen Rochko
454dc407f4 [Glitch] Fix a few visual glitches with link previews in web UI 
Port 9984243467 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-17 13:56:23 +02:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Eugen Rochko
b9fd7571ae
Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
github-actions[bot]
a7264a2b42
New Crowdin Translations (automated) (#30704) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-14 09:08:17 +00:00
Marcin Mikołajczak
a243963e93
LanguageDropdown: remove unused function (#30346) 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-06-13 19:46:45 +00:00
github-actions[bot]
dd587d29b6
New Crowdin Translations (automated) (#30684) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-13 13:30:07 +00:00
Eugen Rochko
ed6d24330b
Add author links on the explore page in web UI (#30521) 2024-06-13 13:04:16 +00:00
Eugen Rochko
9984243467
Fix a few visual glitches with link previews in web UI (#30670) 2024-06-12 13:10:51 +00:00
github-actions[bot]
ced463360e
New Crowdin Translations (automated) (#30666) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-12 10:48:31 +00:00
Claire
4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
David Roetzel
f48f39a767
Fix cutoff of instance name (#30598) 2024-06-11 12:54:37 +00:00
github-actions[bot]
0dabda9bee
New Crowdin Translations (automated) (#30646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-11 07:14:52 +00:00
Claire
be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
github-actions[bot]
bb27321781
New Crowdin Translations (automated) (#30608) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-10 14:29:30 +00:00
GitHub Actions
33b3330dc7 New Crowdin translations 2024-06-09 04:29:04 +00:00
Claire
4c55a6ee73
Merge pull request #2730 from mayafri/fixes/collapsed-toots-gradient 
light theme: fix gradient for collapsed toots
 2024-06-08 14:41:10 +02:00
Claire
905e9fab97
Merge pull request #2696 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2024-06-08 13:42:34 +02:00
GitHub Actions
aab5b10c38 New Crowdin translations 2024-06-08 04:29:18 +00:00
Claire
7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
github-actions[bot]
c1b0c1a5e4
New Crowdin Translations (automated) (#30586) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-07 09:59:30 +00:00
Maya Friedrichs
ac3d761c78 Remove gradient for collapsed toots 
This gradient is already set in `components.scss` with the new background
 2024-06-07 00:36:41 +02:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
github-actions[bot]
a729104a41
New Crowdin Translations (automated) (#30575) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-06 08:53:28 +00:00
Eugen Rochko
3c435f9ba0
Change counters to be displayed on profile timelines in web UI (#30525) 2024-06-05 23:52:46 +00:00
github-actions[bot]
e4e3875452
New Crowdin Translations (automated) (#30543) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-05 07:52:25 +00:00
github-actions[bot]
aa9b80f57d
New Crowdin Translations (automated) (#30517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-03 07:34:33 +00:00
github-actions[bot]
dac4eba46b
New Crowdin Translations (automated) (#30499) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-31 09:26:52 +00:00
github-actions[bot]
a0b525e50b
New Crowdin Translations (automated) (#30477) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-30 14:54:51 +00:00
Eugen Rochko
4069fae10d [Glitch] Add support for fediverse:creator OpenGraph tag 
Port 128987eded to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-29 18:52:11 +02:00
Renaud Chaput
2e3d6e451f [Glitch] Enable stricter Typescript options 
Port 3750e8050c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-29 17:09:35 +02:00
Renaud Chaput
6b4c182806 [Glitch] Fix createDataLoadingThunk to allow actions without arguments 
Port 6a75e1c8c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-29 17:08:13 +02:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
github-actions[bot]
6eea83211c
New Crowdin Translations (automated) (#30464) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-29 11:12:23 +00:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
github-actions[bot]
e5c3dc33a2
New Crowdin Translations (automated) (#30421) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-27 09:35:45 +00:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options (#30435) 2024-05-27 09:24:59 +00:00
Renaud Chaput
6a75e1c8c8
Fix createDataLoadingThunk to allow actions without arguments (#30439) 2024-05-27 09:00:40 +00:00
Renaud Chaput
e947f1f2ed [Glitch] Fix a leftover argument to api() 
Port 8ea2726376 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-24 17:09:49 +02:00
Claire
d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
github-actions[bot]
54351d01f2
New Crowdin Translations (automated) (#30410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-24 08:26:38 +00:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() (#30405) 2024-05-24 08:25:42 +00:00
Renaud Chaput
e32bfad88a [Glitch] Fix createDataLoadingThunk and related actions 
Port b6fd14f0e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:37:00 +02:00
Renaud Chaput
8d6058b40a [Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests 
Port 10ec421dd4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-23 20:33:05 +02:00
Claire
51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
 2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions (#30408) 2024-05-23 18:22:42 +00:00