tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,878 Commits 10 Branches 0 Tags
f3af434c25dc28254b6422787cee606ab6f73fb2
Commit Graph

10947 Commits

Author SHA1 Message Date
Nick Schonning
82a6cf4012 Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
Christian Schmidt
cb868228bd Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
Matt Jankowski
7f4412eeeb User mailer spec coverage improvements (#23905) 2023-03-04 17:16:11 +01:00
Matt Jankowski
c40d5e5a8f Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
Jean byroot Boussier
922837dc96 Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
 2023-03-04 16:38:28 +01:00
Nick Schonning
b00f945d92 Remove implied StandardError rescue (#23942) 2023-03-03 22:49:16 +01:00
Claire
050f1669c6 Fix original account being unfollowed on migration before the follow request could be sent (#21957) 2023-03-03 21:13:55 +01:00
Claire
ddde4e0d95 Change ActivityPub::DeliveryWorker retries to be spread out more (#21956) 2023-03-03 21:08:22 +01:00
Christian Schmidt
5a8c651e8f Only offer translation for supported languages (#23879) 2023-03-03 21:06:31 +01:00
Claire
6b16b77ab0 Fix external authentication not running onboarding code for new users (#23458) 2023-03-03 20:45:55 +01:00
Claire
d6679d1751 Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
Claire
f94aa70b81 Fix error when displaying post history of a trendable post in the admin interface (#23574) 2023-03-03 20:44:02 +01:00
Terry Garcia
a1347f456e Switched bookmark and favourites around (#23701) 2023-03-03 20:37:49 +01:00
Claire
f8bb4d0d6b Fix server error when failing to follow back followers from /relationships (#23787) 2023-03-03 20:36:18 +01:00
Claire
b55fc883b6 Fix duplicate “Publish” button on mobile (#23804) 2023-03-03 20:25:36 +01:00
Claire
c2a046ded1 Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-03 20:25:15 +01:00
Claire
3a6451c867 Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
Claire
276c1d32d6 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski
af578e8ce0 Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski
b6602f68eb Spec coverage for HomeHelper (#23907) 2023-03-02 10:04:14 +01:00
Eugen Rochko
cb97ba7a2f New Crowdin updates (#23802) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-28 23:01:05 +09:00
Nick Schonning
56489cdc4f Autofix Rubocop Style/HashConversion (#23852) 2023-02-28 22:59:19 +09:00
Matt Jankowski
cc3633539e Remove unused admin/announcements helper (#23899) 2023-02-28 11:56:50 +01:00
Matt Jankowski
055ed5a616 Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
Matt Jankowski
4bb39ac3c3 Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
Christian Schmidt
d3eefead30 Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
Claire
b91756fd4d Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire
cc94cc86ae Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Christian Schmidt
b632c5a55a [Glitch] Add lang attribute to preview card 
Port 8000a8f230 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:57 +01:00
Tim Lucas
28cb77bd07 [Glitch] Increase contrast of upload progress background 
Port f4f91bc295 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:24 +01:00
Botao Wang
56bec60f25 [Glitch] Fix sidebar cut-off on small screens in admin UI 
Port 7adde24a95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:40:29 +01:00
Claire
31455f05fb [Glitch] Add lang tag to native language names in language picker 
Port 7207a98d39 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:37:05 +01:00
Renaud Chaput
81ef21a0c8 [Glitch] Rename JSX files with proper .jsx extension 
Port 44a7d87cb1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Claire
859eb01aac Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire
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.
 2023-02-25 14:00:40 +01:00
Matt Jankowski
730bb3e211 Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
Christian Schmidt
8000a8f230 Add lang attribute to preview card (#23869) 2023-02-24 20:04:38 +01:00
Claire
20b80c62ff Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
Tim Lucas
f4f91bc295 Increase contrast of upload progress background (#23836) 2023-02-23 12:58:42 +01:00
Eugen Rochko
2564117131 New Crowdin updates (#23625) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-22 21:16:02 +09:00
Claire
f682478de8 Fix inefficiency when searching accounts per username in admin interface (#23801) 2023-02-22 11:53:13 +01:00
Nick Schonning
4ff44be134 Autofix Rubocop Rails/Blank (#23765) 2023-02-22 09:57:56 +09:00
Nick Schonning
0cfdd1a401 Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
Botao Wang
7adde24a95 Fix sidebar cut-off on small screens in admin UI (#23764) 2023-02-21 10:06:13 +01:00
Claire
7207a98d39 Add lang tag to native language names in language picker (#23749) 2023-02-21 09:23:39 +01:00
Nick Schonning
434770f580 Autofix Rubocop Rails/FindById (#23762) 2023-02-21 10:21:48 +09:00
Nick Schonning
9909b4b653 Autofix Rubocop Rails/WhereEquals (#23759) 2023-02-21 03:20:56 +09:00
Claire
d3b4d4d4f3 Change compose form checkbox to native input with appearance: none (#22949) 2023-02-20 11:32:27 +01:00
Nick Schonning
59c8d43d94 Autofix Rubocop Style/RescueStandardError (#23745) 2023-02-20 11:01:20 +01:00
Christian Schmidt
62c4aecf8f Make larger part of status clickable (#23621) 2023-02-20 08:11:23 +01:00