Nick Schonning
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
Florin
27bafabb64
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
Nick Schonning
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
Nick Schonning
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
Nick Schonning
d5a185d721
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
Matt Jankowski
08fb9d300a
Spec coverage for settings/preferences/* controllers ( #24825 )
2023-05-04 05:44:27 +02:00
Matt Jankowski
2c6c398c60
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
Claire
a2a22bad23
Fix various edge cases with local moves ( #24812 )
2023-05-03 19:19:25 +02:00
Claire
1e75eb690d
Fix own posts not getting delivered to own lists ( #24810 )
2023-05-03 19:17:40 +02:00
Renaud Chaput
45579a26cf
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
fusagiko / takayamaki
0999cb4601
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
Claire
c98b012583
Change Move handler to also move list memberships ( #24808 )
2023-05-03 14:03:38 +02:00
Renaud Chaput
9a52a7f7a0
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
fusagiko / takayamaki
e38b391940
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
Claire
8b636a29c6
Improve automatic post cleanup worker performances ( #24785 )
2023-05-03 10:31:40 +02:00
Matt Jankowski
a0c9f2447e
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
Claire
9c1929efad
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
Claire
d37c0a1060
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
Matt Jankowski
668a19a2f3
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
fusagiko / takayamaki
8227af8dcc
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
Matt Jankowski
b5c4b47746
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
Matt Jankowski
38b2974a83
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
Matt Jankowski
f1c1dd0118
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
Matt Jankowski
a7df578f97
ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )
2023-05-02 18:10:39 +02:00
Matt Jankowski
bae694108a
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
Claire
9189e90ff2
Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN ( #23600 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-05-02 17:42:42 +02:00
Matt Jankowski
5e060e1f44
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
Claire
a89b02af92
Check domain suspensions before trying to fetch resources ( #24535 )
2023-05-02 15:22:19 +02:00
Claire
b233da5996
Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )
2023-05-02 15:09:43 +02:00
Eugen Rochko
8131a5b330
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
Claire
6693a4fe7c
Change lists to be able to include accounts with pending follow requests ( #19727 )
2023-05-02 14:40:36 +02:00
Claire
598e63dad2
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
Matt Jankowski
88d33f361f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
fusagiko / takayamaki
f50105779b
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
fusagiko / takayamaki
5a5975d7f7
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
Claire
32a030dd74
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
Nick Schonning
fc56eda94b
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
fusagiko / takayamaki
15fd712464
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
fusagiko / takayamaki
81f75b1e0e
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
Matt Jankowski
d902a707a3
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
Matt Jankowski
af824db398
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
Eugen Rochko
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
dependabot[bot]
fa14976a5d
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-04-30 15:45:02 +09:00
Matt Jankowski
bdc74086e6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
Matt Jankowski
6e226f5a32
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
Claire
678d836c7d
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
Claire
cf1bc4bb93
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
Nick Schonning
f22b4e556c
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
Christian Schmidt
bfeccf6748
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
Claire
e79998a11a
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
Eugen Rochko
38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2023-04-29 18:54:13 +02:00
Nick Schonning
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
Claire
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
Claire
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2023-04-29 12:21:44 +02:00
Claire
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2023-04-29 12:17:06 +02:00
Eugen Rochko
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
Eugen Rochko
8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2023-04-29 11:34:44 +02:00
Chike Nwaenie
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2023-04-29 11:28:24 +02:00
Christian Schmidt
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
Claire
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2023-04-29 11:14:43 +02:00
Claire
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2023-04-29 11:12:35 +02:00
fusagiko / takayamaki
66bda4713e
[Glitch] Allow == when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
Claire
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
Claire
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
Claire
2a3a110f00
Fix wrong classes audio and video instead of audio-player and video-player in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
Claire
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
Eugen Rochko
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
Claire
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
Eugen Rochko
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
Eugen Rochko
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
Eugen Rochko
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
Claire
a5bc4ea550
Fix refering to unused preview-card CSS class instead of status-card ( #24696 )
2023-04-28 07:50:31 +02:00
Matt Jankowski
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
Nick Schonning
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
Claire
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
Eugen Rochko
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
Plastikmensch
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2023-04-26 21:30:41 +02:00
Matt Jankowski
91a8cd21d8
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
Claire
b0bf6216e6
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
Claire
62ab7506d6
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +02:00
Claire
1527b02c6d
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
Claire
1419f90ef2
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +02:00
Plastikmensch
678480d4d3
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch
aea7866161
Change drawer--header to drawer__header ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Claire
276c39361b
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
2023-04-25 16:51:38 +02:00
Eugen Rochko
6084461cd0
Change unauthenticated responses to be cached in REST API ( #24348 )
2023-04-25 15:41:34 +02:00
Eugen Rochko
c35e3cb6ac
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
Eugen Rochko
8099ba04be
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2023-04-25 06:33:21 +02:00
Claire
e9a79d46cd
Fix crash when SSO_ACCOUNT_SETTINGS is not defined ( #24628 )
2023-04-24 20:26:04 +02:00
Eugen Rochko
804aa8d501
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
Nick Schonning
2daa5a1549
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
Eugen Rochko
290e4aba31
Add lines to threads in web UI ( #24549 )
2023-04-24 08:07:03 +02:00
Christian Schmidt
5141697323
Remove tai locale ( #23880 )
2023-04-23 22:49:07 +02:00
Nick Schonning
ef3675d688
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
Matt Jankowski
0a5f0a8b20
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
Chike Nwaenie
e1b4eeb636
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2023-04-23 22:33:08 +02:00
Christian Schmidt
e713c545b8
Use CSS to trim long card descriptions ( #24265 )
2023-04-23 22:32:47 +02:00
Claire
58a1b2e330
Fix caching logic with regards to Accept-Language, Cookie, and Signature ( #24604 )
2023-04-23 22:27:24 +02:00
Claire
5dc3173ef8
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly ( #24607 )
2023-04-23 22:25:40 +02:00
Eugen Rochko
0461f83320
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
Claire
5b58ebb04f
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
Eugen Rochko
9d75b03ba4
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
fusagiko / takayamaki
9ef32ea570
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port ab740f464a
2023-04-22 11:28:23 +02:00
fusagiko / takayamaki
799e9917e4
[Glitch] Rewrite GIFV component with React hooks
...
Port cf3fa1e814
2023-04-22 11:22:49 +02:00
Eugen Rochko
6ea9137233
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 955ec252a4
2023-04-22 10:47:44 +02:00
Claire
bc7b3399fb
[Glitch] Fix crash when trying to open the filter modal
...
Port bc4745f482
2023-04-22 10:20:50 +02:00
Eugen Rochko
2f3dffb057
[Glitch] Add progress indicator to sign-up flow
...
Port e5c0b16735
2023-04-22 10:18:20 +02:00
Ivan Rodriguez
a21a875dba
[Glitch] Fix status title for statuses without text
...
Port f05fb51ecb
2023-04-22 10:16:20 +02:00
Nick Schonning
f2797276b2
[Glitch] typo: collapsable -> collapsible
...
Port d02aa274be
2023-04-22 10:13:58 +02:00
Claire
abfdafef1e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Claire
501d6197c4
Change automatic post deletion thresholds and load detection ( #24614 )
2023-04-21 18:14:19 +02:00
Claire
fbb4de3dbc
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
Claire
b0eba1a060
Minor clean up and optimization of the automatic post deletion code ( #24613 )
2023-04-21 16:53:50 +02:00
Claire
37886c28da
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
fusagiko / takayamaki
c1a7e38d2b
Allow == when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
Eugen Rochko
e98c86050a
Refactor Cache-Control and Vary definitions ( #24347 )
2023-04-19 16:07:29 +02:00
Robert R George
4db8230194
Add trend management to admin API ( #24257 )
2023-04-18 11:33:30 +02:00
Heitor de Melo Cardozo
bc75e62ca6
Change moderation search an account using the username with @ ( #24242 )
2023-04-17 14:16:36 +02:00
fusagiko / takayamaki
ab740f464a
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
Claire
85b1b45820
Fix crash in NotifyService when trying to send an email notification for polls ( #24558 )
2023-04-17 13:13:36 +02:00
Heitor de Melo Cardozo
4601e0dcbb
Add user handle to notification mail recipient address ( #24240 )
...
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
2023-04-17 11:06:06 +02:00
Claire
bc4745f482
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
fusagiko / takayamaki
9f8d34620b
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
Eugen Rochko
34f8e696e2
[Glitch] Change all components to use the same error page in web UI
...
Port cee357d538
2023-04-16 18:20:51 +02:00
Claire
a3c05640f7
[Glitch] Add “In Memoriam” banner back to profiles
...
Port 86ad43173f
2023-04-16 18:02:16 +02:00
Claire
cb0562f32c
[Glitch] Fix tab arrows on RTL layouts
...
Port af49d93fd6
2023-04-16 17:58:32 +02:00
Claire
f9a9f9344b
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
Plastikmensch
f28942cef9
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port babd86e59445848d6547
2023-04-16 17:45:18 +02:00
Claire
0cbd579ef0
New Crowdin updates ( #2172 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
2023-04-16 17:25:43 +02:00
fusagiko / takayamaki
cf3fa1e814
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
Eugen Rochko
e5c0b16735
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
Eugen Rochko
955ec252a4
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
Ivan Rodriguez
f05fb51ecb
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
Nick Schonning
d02aa274be
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
Plastikmensch
bed63f6dae
Fix default content type setting not applying ( #2176 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +02:00
Claire
af49d93fd6
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
Claire
8f0b0435ab
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
Claire
86ad43173f
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
Eugen Rochko
c5eba06d8c
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
Claire
f53d009778
Refactor Status._insert_record slightly and tighten the test around reblogs of discarded statuses ( #24516 )
2023-04-12 12:47:05 +02:00
Eugen Rochko
cee357d538
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
Kuba Suder
aca2cd1528
fixed typo in a constant name ( #24511 )
2023-04-12 10:06:57 +02:00
Claire
63a39ae2fa
Run yarn manage:translations
2023-04-09 15:56:31 +02:00
Claire
c11e69f33a
Move glitch-soc-only translation strings out of app/javascript/mastodono/locales
2023-04-09 15:53:45 +02:00
Nick Schonning
bfe46d08f9
[Glitch] Ensure tabIndex is number instead of string
...
Port ec0c104bf2
2023-04-09 14:47:29 +02:00
Christian Schmidt
53cdcce3d1
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port 9ef9974ff2
2023-04-09 12:10:01 +02:00
Nick Schonning
b756e49cf1
[Glitch] Enable Stylelint property-no-unknown
...
Port cd14f712ad
2023-04-09 12:05:55 +02:00
Christian Schmidt
7b04c2fb71
[Glitch] Fix tooltip for dates without time
...
Port aa136cf2fa
2023-04-09 12:04:17 +02:00
Nick Schonning
5b88b7e81a
[Glitch] Remove Array.prototype.includes polyfill
...
Port c0886dee14
2023-04-09 12:03:11 +02:00
Christian Schmidt
df6602ede1
[Glitch] Fix account header image missing in low-res
...
Port d7b8c6db7e
2023-04-09 12:01:55 +02:00
Christian Schmidt
74c61b05ae
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port ffd5b2eea4
2023-04-09 12:01:11 +02:00
Nick Schonning
791e712a80
[Glitch] Update display_media typing to string
...
Port 17b2fd2177
2023-04-09 12:00:26 +02:00
Nick Schonning
f3f7ef2d13
[Glitch] Set marginRight as string
...
Port 927b2fd138
2023-04-09 11:59:42 +02:00
Nick Schonning
358e4067bb
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port ab3f23da91
2023-04-09 11:58:45 +02:00
Nick Schonning
0f62451424
[Glitch] HTML string attributes set as booleans
...
Port a425915ce7
2023-04-09 11:56:02 +02:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
10469a0b85
Move locale-data back to app/javascript/mastodon/locales/locale-data ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Claire
99e3e152cd
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
Claire
c3a8f6a0a3
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
Christian Schmidt
aa136cf2fa
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
9ef9974ff2
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Matt Jankowski
d193bc8c5c
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
Nick Schonning
c0886dee14
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Christian Schmidt
d7b8c6db7e
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Eugen Rochko
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Claire
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
9d08b81193
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
Christian Schmidt
ffd5b2eea4
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
Nick Schonning
17b2fd2177
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
Nick Schonning
927b2fd138
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
Nick Schonning
ab3f23da91
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
Nick Schonning
cd14f712ad
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
Claire
45848d6547
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
Nick Schonning
ec0c104bf2
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
Nick Schonning
a425915ce7
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
Rubicon Rowe
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2023-04-04 12:51:24 +02:00
Claire
d13ef49b15
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
Claire
0e919397db
Fix unescaped user input in LDAP query ( #24379 )
2023-04-04 12:42:38 +02:00
Rubicon Rowe
fa98363a27
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
Nick Schonning
8e19c44b2c
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
Christian Schmidt
d29cf8a044
[Glitch] Add colour to follow button when hashtag is being followed
...
Port 77bd32a26a
2023-04-03 18:07:34 +02:00
Claire
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Christian Schmidt
77bd32a26a
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
Eugen Rochko
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
Nick Schonning
373e4a8ff0
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
Claire
7b15f4006a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
Eugen Rochko
2b11376411
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
Eugen Rochko
46483ae849
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
Vyr Cossont
d5ad8b6422
Fix Redis client and type errors introduced in #24285 ( #24342 )
2023-04-01 08:28:35 +02:00
Tdxdxoz
d874a7a10f
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port 74f56c64fc
2023-03-31 22:50:57 +02:00
Nick Schonning
a8f0592b72
[Glitch] Move marky to devDependency
...
Port ddb769f0b8
2023-03-31 22:50:57 +02:00
Claire
3dcba94e68
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
Claire
280fa3b2c0
Fix invalid/expired invites being processed on sign-up ( #24337 )
2023-03-31 21:42:28 +02:00
Claire
01d6f7529f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
Nick Schonning
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
Vyr Cossont
7646ad8a2b
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
Christian Schmidt
b4f38edf74
Wrong type for user setting when default is defined by lambda ( #24321 )
2023-03-31 07:33:17 +02:00
Eugen Rochko
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Tdxdxoz
74f56c64fc
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
mogamin
9c84563008
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
Christian Schmidt
eb38e9df31
Requeue expiration notification ( #24311 )
2023-03-29 10:52:40 +02:00
Claire
e084b5b82d
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
Nick Schonning
ddb769f0b8
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
Eugen Rochko
cf12621e37
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Eugen Rochko
babd86e594
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
Vyr Cossont
88fc04d3d7
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
2023-03-27 08:51:57 +02:00
Nick Schonning
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
2023-03-26 15:49:49 +02:00
Claire
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
mogamin
63a6808ee1
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
Matt Jankowski
0663803348
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
Matt Jankowski
e633b26f4f
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
Matt Jankowski
e63524f457
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
Eugen Rochko
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
ef127c964a
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Yamagishi Kazutoshi
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Nick Schonning
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Christian Schmidt
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
Claire
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
Claire
2626097869
Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
Matt Jankowski
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
mogamin
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Plastikmensch
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
Christian Schmidt
8f97ffe91e
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
Claire
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Eugen Rochko
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
bd047acc35
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Eugen Rochko
630436ab2d
Refactor monkey-patching of PrivateAddressCheck ( #24122 )
2023-03-16 04:33:38 +01:00
Nick Schonning
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
Nick Schonning
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
Rodion Borisov
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
PauloVilarinho
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2023-03-15 09:33:14 +01:00
Claire
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
Nick Schonning
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
Claire
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
Claire
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
