03ac84b0f4
[Glitch] Fix duplicate “Publish” button on mobile
...
Port b55fc883b6
2 years ago
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2 years ago
bb4e211c86
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2 years ago
0e476f3c4f
[Glitch] Add `lang` attribute to media and poll options
...
Port d3eefead30
2 years ago
82a6cf4012
Enable Rubocop for app/views ( #23874 )
2 years ago
cb868228bd
Do not leave Mastodon when clicking “Back” ( #23953 )
2 years ago
7f4412eeeb
User mailer spec coverage improvements ( #23905 )
2 years ago
c40d5e5a8f
Misc coverage improvements for validators ( #23928 )
2 years ago
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
b00f945d92
Remove implied StandardError rescue ( #23942 )
2 years ago
050f1669c6
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2 years ago
ddde4e0d95
Change `ActivityPub::DeliveryWorker` retries to be spread out more ( #21956 )
2 years ago
5a8c651e8f
Only offer translation for supported languages ( #23879 )
2 years ago
6b16b77ab0
Fix external authentication not running onboarding code for new users ( #23458 )
2 years ago
d6679d1751
Add mail headers to avoid auto-replies ( #23597 )
2 years ago
f94aa70b81
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2 years ago
a1347f456e
Switched bookmark and favourites around ( #23701 )
2 years ago
f8bb4d0d6b
Fix server error when failing to follow back followers from `/relationships` ( #23787 )
2 years ago
b55fc883b6
Fix duplicate “Publish” button on mobile ( #23804 )
2 years ago
c2a046ded1
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2 years ago
3a6451c867
Add support for incoming rich text ( #23913 )
2 years ago
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
af578e8ce0
Fix deprecation warning about merging conditions ( #23618 )
2 years ago
b6602f68eb
Spec coverage for HomeHelper ( #23907 )
2 years ago
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
56489cdc4f
Autofix Rubocop Style/HashConversion ( #23852 )
2 years ago
cc3633539e
Remove unused admin/announcements helper ( #23899 )
2 years ago
055ed5a616
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2 years ago
4bb39ac3c3
Fix single-record invalid condition on PollVote ( #23810 )
2 years ago
d3eefead30
Add `lang` attribute to media and poll options ( #23891 )
2 years ago
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2 years ago
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2 years ago
b632c5a55a
[Glitch] Add `lang` attribute to preview card
...
Port 8000a8f230
2 years ago
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2 years ago
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2 years ago
31455f05fb
[Glitch] Add `lang` tag to native language names in language picker
...
Port 7207a98d39
2 years ago
81ef21a0c8
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port 44a7d87cb1
2 years ago
859eb01aac
Fix building vanilla flavor after JSX change
2 years ago
4ed09276d5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2 years ago
730bb3e211
Remove unused HTML Validator ( #23866 )
2 years ago
8000a8f230
Add `lang` attribute to preview card ( #23869 )
2 years ago
20b80c62ff
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2 years ago
f4f91bc295
Increase contrast of upload progress background ( #23836 )
2 years ago
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
f682478de8
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2 years ago
4ff44be134
Autofix Rubocop Rails/Blank ( #23765 )
2 years ago
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2 years ago
7adde24a95
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2 years ago
7207a98d39
Add `lang` tag to native language names in language picker ( #23749 )
2 years ago
434770f580
Autofix Rubocop Rails/FindById ( #23762 )
2 years ago
Claire
Christian Schmidt
Nick Schonning
Matt Jankowski
Jean byroot Boussier
Terry Garcia
Eugen Rochko
Tim Lucas
Botao Wang
Renaud Chaput