760b04e019
uhhhhhh fuckign try anything
2024-02-03 15:55:32 +09:00
ceb5c61a05
Revert "uhhhhhh will this unfuck emoji picker"
...
This reverts commit 9d3b88cf1b
2024-02-03 15:49:54 +09:00
9d3b88cf1b
uhhhhhh will this unfuck emoji picker
2024-02-03 15:44:30 +09:00
f27bc326d4
woop
2024-02-03 15:13:58 +09:00
b919006502
uhhhhh help
2024-02-03 15:03:02 +09:00
1daea5fb31
AAAAA
2024-02-03 14:56:27 +09:00
c18931479c
madness
2024-02-03 14:51:17 +09:00
309dd36816
neofox_transgender
2024-02-03 14:41:20 +09:00
415c5eb2d4
Merge remote-tracking branch 'claire/glitch-soc/features/redesign-localonly-toots' into th-downstream
2024-02-03 14:28:39 +09:00
fa3b5195fd
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream
2024-02-03 14:21:55 +09:00
1b1c4ff940
also send misskey quote data
2024-02-03 14:18:41 +09:00
Ariadne Conill
2029340d6a
glitch: status: fix quote icon on quotes
2024-02-02 21:14:01 -08:00
Ariadne Conill
cc97d5b0be
CSP: allow unsafe-inline for CSS
2024-02-02 21:07:12 -08:00
Ariadne Conill
2a35ae9dc2
glitch: fix quote-toot icon
2024-02-02 20:59:21 -08:00
Ariadne Conill
a3cebd15da
glitch: compose: remove annoying post published messages
2024-02-02 20:29:43 -08:00
Ariadne Conill
243a7d967b
woodpecker: build streaming image too
2024-02-02 20:11:11 -08:00
Kouhai
4467b3ff37
Merge remote-tracking branch 'glitch/main'
2024-02-01 09:15:33 -08:00
Aaron Brady
970320d73c
Restore -streaming suffix for security builds ( #2602 )
2024-02-01 17:20:08 +01:00
Claire
63d7a30503
Fix build-security workflow for glitch-soc
2024-02-01 16:09:51 +01:00
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
Claire
3866597e24
Merge pull request #2601 from ClearlyClaire/glitch-soc/fixes/security-builds-latest
...
Fix security builds not being tagged latest
2024-02-01 11:48:45 +01:00
Kouhai
c1910db65f
th: live from new york it's friday night
...
various critical fixes (pls don't report this to NVD)
2024-02-01 02:37:15 -08:00
Claire
a7b16003e1
Fix security builds not being marked latest
2024-02-01 11:31:29 +01:00
Claire
626ff320cf
Merge pull request #2600 from ClearlyClaire/glitch-soc/fixes/failures
...
Configure selenium to use Chrome version 120 (#29038 )
2024-02-01 11:30:34 +01:00
Matt Jankowski
f4416e6b3a
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 11:15:23 +01:00
Claire
7bb5f6efbc
Merge pull request #2599 from ClearlyClaire/glitch-soc/build-action
...
Add github action workflow for manual security builds
2024-02-01 11:14:40 +01:00
Claire
883f589653
Fix missing workflow_dispatch trigger for build-security ( #29041 )
2024-02-01 10:58:10 +01:00
Claire
85bdd145dc
Adapt workflow to glitch-soc
2024-02-01 10:40:04 +01:00
Claire
a48447a6b2
Add github action workflow for manual security builds ( #29040 )
2024-02-01 10:39:23 +01:00
Kouhai
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
2024-02-01 00:46:44 -08:00
Kouhai
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
2024-02-01 00:33:58 -08:00
Claire
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
Claire
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
2024-01-30 22:42:22 +01:00
Essem
9eef1295f0
Fix rubocop lint issue
2024-01-28 14:51:37 -06:00
Claire
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
Claire
a4e7cc2d94
Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to bf153b384b
2024-01-28 14:47:35 +01:00
Claire
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
Claire
420ca90071
Merge pull request #2585 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3205a654ca
2024-01-27 18:35:29 +01:00
Claire
dd7a66949a
Fix CSS loading in redirect controller
2024-01-26 21:04:02 +01:00
Claire
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
Eugen Rochko
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
github-actions[bot]
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 19:45:04 +01:00
Claire
108fb33478
Merge pull request #2584 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 7a1f087659
2024-01-26 18:47:09 +01:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Claire
adde803656
Merge pull request #2583 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 01ce9df880
2024-01-25 19:50:12 +01:00
Matt Jankowski
42ab855b23
Add specs for Instance model scopes and add with_domain_follows scope ( #28767 )
2024-01-25 15:28:27 +00:00
Matt Jankowski
4cdf62e576
Extract rebuild_index method in maintenance CLI ( #28911 )
2024-01-25 15:26:51 +00:00
Matt Jankowski
0b38946c87
Update paperclip and climate_control gems ( #28379 )
2024-01-25 15:18:15 +00:00
Matt Jankowski
17ea22671d
Fix Style/GuardClause cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
