Commit Graph

12366 Commits

Author SHA1 Message Date
Eugen Rochko a7bad8f45c [Glitch] Fix profile setup showing default avatar in web UI
Port 01f0a6ca4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko b534532eaf [Glitch] Change to single opt-in during profile setup in onboarding in web UI
Port 0e9801443f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko bacb9134cc [Glitch] Add profile setup to onboarding in web UI
Port d67bd44ca1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Renaud Chaput 2653651bfa [Glitch] Simplify column headers
Port 13d310e64d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Renaud Chaput ca17c2d35a [Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage
Port 537442853f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Claire e2c7c370dc Fix size of glitch-soc status info icons 2024-01-14 00:09:28 +01:00
Claire e2ba5f6e35 Fix glitch-soc high color privacy icons 2024-01-14 00:04:09 +01:00
Claire e227e959f7 Fix glitch-soc textarea icons 2024-01-13 23:53:23 +01:00
Claire 6333900006 Fix glitch-soc CW media icons 2024-01-13 23:48:37 +01:00
Claire 46128f25b6 Fix glitch-soc status media icons 2024-01-13 23:35:53 +01:00
Santiago Kozak 731f01adb1 [Glitch] Fix reply icon display in picture-in-picture footer
Port 1cba91d6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput dd56900fac [Glitch] Fixes dropdown target without a `buttonRef` (edit history)
Port 7b1d390734 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko a8c59c2506 [Glitch] Add icons for private and disabled boost in web UI
Port 7e3c10dec6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
zunda b2a6386b7d [Glitch] Adjust transform origin for favorite star
Port e4e752c26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko 6230d50f3f [Glitch] Fix various icon styles in web UI
Port fa7e64df1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput b67d977e20 [Glitch] Add missing ban icons
Port a4e6fe36cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput 9b32a37b6f [Glitch] Fix missing icon props
Port f08ca3f042 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko d54414866c [Glitch] Change icons in web UI
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Claire 5f8618443c
Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design
Port upstream's role badge design
2024-01-13 14:25:55 +01:00
Eugen Rochko eae3275fff [Glitch] Change design of role badges in web UI
Port 2cbdff97ce to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 13:09:04 +01:00
Claire a40ce78f11 [Glitch] Add role badges to the WebUI
Port 1e4ccc655a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:50:27 +01:00
Claire a25e03dbc3 Revert "Add role badges to WebUI (#2096)"
This reverts commit d9a078e6d3.
2024-01-13 12:43:25 +01:00
Renaud Chaput d6609635cb [Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
Port 383be173af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Essem ca31b4de3a [Glitch] Add new emojis from `jdecked/twemoji` 15.0
Port b6e353537b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Matt Jankowski 575ab085be
Disable `Rails/ApplicationController` for `HealthController` (#28705) 2024-01-12 09:08:17 +00:00
Renaud Chaput 383be173af
Add a version comment to the emoji preval-ed file so it is regenerated (#28700) 2024-01-12 03:39:11 +00:00
Claire 15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Essem b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 (#28404) 2024-01-11 16:15:08 +00:00
Matt Jankowski b68f185573
Reduce `LineLength` for `react_component` helper in views/admin (#28694) 2024-01-11 13:14:24 +00:00
Claire 23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Claire 5dcb8d92c3 Fix lint issue in glitch-soc-only setting form 2024-01-11 13:22:39 +01:00
Claire 63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
github-actions[bot] e5b97eadd5
New Crowdin Translations (automated) (#2502)
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
Matt Jankowski 87097a227c
Clean up `settings/featured_tags/index` view (#28688) 2024-01-11 10:45:26 +00:00
Matt Jankowski 55802242ce
Refactor login activity partial (remove inline ruby) (#28687) 2024-01-11 10:36:27 +00:00
github-actions[bot] 204bbf49d2
New Crowdin Translations (automated) (#28692)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
Matt Jankowski 6daa69327b
Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Renaud Chaput 09376a8207 [Glitch] Upgrade Redux packages
Port a0e237a96f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:34:23 +01:00
Claire 51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire 7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:02:37 +01:00
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Claire d7e13e2483
Fix potential redirection loop of streaming endpoint (#28665) 2024-01-10 15:05:46 +00:00
Matt Jankowski 543d7890fd
Use normalizes to prepare `User` values (#28650)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
Matt Jankowski a71e918e95
Fix `LineLength` haml-lint in `media/player` view (#28667) 2024-01-10 09:35:01 +00:00
Matt Jankowski eed4eef39a
Fix `LineLength` haml-lint in `app/views/auth` area (#28664) 2024-01-09 16:03:16 +00:00
Matt Jankowski 09ab073f0c
Fix `LineLength` haml-lint in `app/views/settings` area (#28663) 2024-01-09 15:28:56 +00:00
Claire 10203bd57a
Clean up `Setting` model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00