Eugen Rochko
6230d50f3f
[Glitch] Fix various icon styles in web UI
...
Port fa7e64df1d
2024-01-13 23:19:01 +01:00
Renaud Chaput
b67d977e20
[Glitch] Add missing ban icons
...
Port a4e6fe36cb
2024-01-13 23:19:01 +01:00
Renaud Chaput
9b32a37b6f
[Glitch] Fix missing icon props
...
Port f08ca3f042
2024-01-13 23:19:01 +01:00
Eugen Rochko
d54414866c
[Glitch] Change icons in web UI
...
Port 134de736dc
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
Claire
b7eaae4acd
Merge pull request #2565 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to cd37048439
2024-01-13 14:04:34 +01:00
Eugen Rochko
eae3275fff
[Glitch] Change design of role badges in web UI
...
Port 2cbdff97ce
2024-01-13 13:09:04 +01:00
Claire
a40ce78f11
[Glitch] Add role badges to the WebUI
...
Port 1e4ccc655a
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
2024-01-13 12:39:09 +01:00
Essem
ca31b4de3a
[Glitch] Add new emojis from jdecked/twemoji 15.0
...
Port b6e353537b
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
Claire
e76b7ebe89
Merge pull request #2563 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2954279e9c
2024-01-12 13:19:14 +01:00
Matt Jankowski
cd37048439
Move followable_by coverage to suggestions ( #28697 )
2024-01-12 09:11:34 +00:00
Matt Jankowski
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
Renaud Chaput
923fc83190
Improve lint-staged config ( #28704 )
2024-01-12 09:09:57 +00: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
Claire
cbc951627c
Merge pull request #2562 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 0a7cff53c2
2024-01-11 18:41:33 +01:00
Matt Jankowski
8b26614fa7
Combine results include check in spec/models/account ( #28471 )
2024-01-11 16:17:45 +00:00
Matt Jankowski
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00:00
Essem
b6e353537b
Add new emojis from jdecked/twemoji 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
renovate[bot]
22d866ee1b
Update dependency @material-symbols/svg-600 to v0.14.4 ( #28603 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-11 15:43:45 +00:00
Matt Jankowski
2954279e9c
Remove double subject call in api/v1/admin/trends/links/links spec ( #28695 )
2024-01-11 15:13:11 +00:00
Matt Jankowski
95bd46d32a
Remove double subject call in api/v1/admin/ip_blocks spec ( #28696 )
2024-01-11 15:11:57 +00:00
Matt Jankowski
b68f185573
Reduce LineLength for react_component helper in views/admin ( #28694 )
2024-01-11 13:14:24 +00:00
renovate[bot]
782a0165c7
Update dependency node to 20.11 ( #28670 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-11 12:48:01 +00:00
Claire
08304075be
Fix old glitch-soc migration using removed add_column_with_default helper
2024-01-11 13:26:17 +01: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
Claire
b523188807
Merge pull request #2559 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5dc634796a
2024-01-11 12:08:56 +01:00
Matt Jankowski
3f3df9ab20
Update omniauth-cas to version 3.0.0 ( #28683 )
2024-01-11 10:57:52 +00:00
Matt Jankowski
4e08a4892f
Move streaming around config into manager class ( #28684 )
2024-01-11 10:54:42 +00: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
Matt Jankowski
0a7cff53c2
Add coverage for Account.followable_by scope ( #28689 )
2024-01-11 09:30:29 +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
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
2c70ca0674
Increase Metrics/AbcSize limit
2024-01-10 18:03:31 +01:00
Claire
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
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
8422b8ded0
Extract capybara config and improve headless_chrome driver config ( #28681 )
2024-01-10 14:54:11 +00:00
