3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
11 months ago
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
11 months ago
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
11 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
11 months ago
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
11 months ago
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
11 months ago
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
11 months ago
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 months ago
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
11 months ago
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
11 months ago
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
11 months ago
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
11 months ago
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
11 months ago
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
11 months ago
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
11 months ago
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
11 months ago
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
11 months ago
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
f3864db409
Fix notification sounds ( #28316 )
11 months ago
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
11 months ago
df5c64fe57
Further reduce differences with upstream
11 months ago
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
11 months ago
4b2ddaf106
Further reduce differences with upstream
11 months ago
408d4710ed
Further reduce differences with upstream
11 months ago
a27abb4802
Further reduce code differences with upstream ( #2509 )
11 months ago
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
11 months ago
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179eed1de7fb7fa9f8d34620b
11 months ago
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
ee83d5c760
Enable the eslint `react/no-unknown-property` rule ( #28217 )
11 months ago
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
11 months ago
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
11 months ago
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
11 months ago
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
11 months ago
9ac73a1fbf
[Glitch] Change `eslint` config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
11 months ago
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
11 months ago
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
11 months ago
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
11 months ago
046cb408b7
[Glitch] Fix front-end bug when processing relationship-related account actions
...
Port 287520453c
11 months ago
c3a0d5aca3
[Glitch] Fix Redux types
...
Port 0712cc2b99
11 months ago
6fb5fafd28
[Glitch] Convert `actions/account_notes` into Typescript
...
Port bd06c13204
11 months ago
ee58f680e8
[Glitch] Fix autocomplete suggestions being cut off in compose form
...
Port 6833732852
11 months ago
6269a5336f
[Glitch] Change composer highlight border size to be more noticeable
...
Port aa4c9730f6
11 months ago
204fe83fcc
[Glitch] Fix compose textarea scroll behavior
...
Port 746979f75d
11 months ago
a8f6a5b40f
Update translation strings
11 months ago
786b42e2b5
Fix SCSS and JS linting issues
11 months ago
a0943b8f6d
Remove glitch-soc's old onboarding modal
11 months ago
6dc812dd51
[Glitch] Upgrade to react-router v5 in onboarding code
...
Port 1b70d7ed7c
11 months ago
06e819537b
[Glitch] Change labels and styles on the onboarding screen in web UI
...
Port a985d587e1
11 months ago
d5bad93460
[Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI
...
Port 4a5464f360
11 months ago
c2c25122e8
[Glitch] Rewrite <Check /> as FC
...
Port 6fdbee240c
11 months ago
a1667ba796
[Glitch] Upgrade react-intl usage in onboarding code
...
Port remaining of 44cd88adc4
11 months ago
e47c582283
Fix import order
11 months ago
ba4c8a9b41
[Glitch] Use the new JSX transform in onboarding code
...
Port the remaining of 8f66126b10
11 months ago
6e4497ab2d
[Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email
...
Port 52d36f0f98
11 months ago
1cb8df655b
[Glitch] Fix Onboarding Errors
...
Port b8a2430642
11 months ago
0b1556b7f7
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
11 months ago
542f2fb1e0
[Glitch] Add default post text to onboarding flow in web UI
...
Port 8979b70975
11 months ago
e0b401e295
[Glitch] Add more tips to onboarding flow in web UI
...
Port c35e3cb6ac
11 months ago
4537b4b961
[Glitch] Add new onboarding flow to web UI
...
Port 0461f83320
11 months ago
335cfab32f
Change account note design to match upstream's ( #2495 )
11 months ago
f1241b4a3a
Fix translation string for `status.favourite` not having been changed everywhere ( #2494 )
11 months ago
edd96ce786
Merge pull request #2492 from ClearlyClaire/glitch-soc/painful-backports
...
Port account rows design change from upstream
11 months ago
21df2a68ac
Hide followers count when hidden by instance or user
11 months ago
09062d393f
Fix more styling issues
11 months ago
28d4f3ab70
Fix account component styling wrt. upstream
11 months ago
dc917cfcdf
[Glitch] Fix account.jsx imports ( #25541 )
...
Port remaining part of e0d230fb3720e85c0e839d45a444f9
11 months ago
17372a3ec0
[Glitch] Change labels and styles on the onboarding screen in `Account` component
...
Partial port of a985d587e1
11 months ago
0421b44f22
[Glitch] Change follow button in account row to be more obvious in web UI ( #24956 )
...
Port 0ddc895282
11 months ago
f1691eca55
[Glitch] Fix overflow behavior of account rows
...
Port 5fae2de454
11 months ago
98a7b95058
[Glitch] Update inconsistent `defaultMessage` in `Account` component
...
Partial port of e58c36d308
11 months ago
b047b981cd
[Glitch] Enforce import order with ESLint
...
Port d27216dc46
11 months ago
b8cbaba283
[Glitch] Split `EmptyAccount` out of `Account` component
...
Partial port of b8a2430642
11 months ago
32ec0d2472
[Glitch] Fix verified badge in account lists potentially including rel="me" links
...
Port 55e7c08a83
11 months ago
e7ec2641a0
[Glitch] Fix linting issues with VerifiedBadge component
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
2efb22f455
[Glitch] Rewrite VerifiedBadge component as function component
...
Port 140aa6b054
11 months ago
00db5c8ade
[Glitch] Split VerifiedBadge from Account component
...
Partial port of 0461f83320
11 months ago
e0aba64a64
[Glitch] Fix regressions from change in account row design in web UI
...
Port 46483ae849
11 months ago
a262f990f8
Change design of account rows in web UI ( #24247 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
5b0382abc5
Remove redundant asset preload ( #2488 )
...
* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
11 months ago
b20af17a2c
Fix onboarding step descriptions being truncated on narrow screens ( #28021 )
11 months ago
7faa27e17d
Change dismissed banners to be stored server-side ( #27055 )
11 months ago
3a7f10c3f1
Converted hashtag.jsx to TypeScript ( #27872 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
12 months ago
1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript ( #27895 )
12 months ago
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
bcc0a24acd
Merge remote-tracking branch 'glitch/main' ( 660372d130)
12 months ago
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e)
12 months ago
fad9343bab
New Crowdin Translations (automated) ( #28069 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
b3581d1e2f
Fix @rails/ujs import on public.jsx ( #2482 )
...
Related: 8a131fb7bc
12 months ago
8521238677
New Crowdin Translations (automated) ( #28060 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
6e70819840
Change search popout to not list unusable search options when logged out ( #27918 )
12 months ago
c810b197ad
New Crowdin Translations (automated) ( #28050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
d3ed03fd6b
New Crowdin Translations (automated) ( #28036 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
32319187ee
Fix error when muting users from Web UI ( #28016 )
12 months ago
3c3e0c25ef
New Crowdin Translations (automated) ( #28015 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
f00fcda785
Reduce differences with upstream in `Account` component
12 months ago
9ab1aa15e9
Change `ReplyIndicator` implementation and markup to match upstream's
12 months ago
8ceae2bce6
New Crowdin Translations (automated) ( #27966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
0e9801443f
Change to single opt-in during profile setup in onboarding in web UI ( #27876 )
12 months ago
9c68741f46
New Crowdin Translations (automated) ( #27914 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
d3ae5b21d2
Reduce code and markup discrepancies on reply indicator
12 months ago
e023acfd00
Remove unnecessary proptype discrepancy
12 months ago
0a6ec048a8
Fix upper border radius of onboarding columns ( #27890 )
12 months ago
c94bedf4e6
Use container queries to hide profile share button ( #27889 )
12 months ago
87696ea26e
Add prominent share/copy button on profiles in web UI ( #27865 )
12 months ago
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
36f25ea067
Fix more import discrepancies
12 months ago
4101057b9a
Fix various code discrepancies
12 months ago
09a5a78527
Fix discrepancy for `autosuggest-emoji` class
12 months ago
f69f1e9429
Fix code discrepancies with upstream
12 months ago
d358a3cc61
Merge pull request #2468 from ClearlyClaire/glitch-soc/cleanup
...
Clean up some more and reduce unwarranted differences with upstream further
12 months ago
0d877a3076
[Glitch] Change compose form checkbox to native input with `appearance: none`
...
Port d3b4d4d4f3
12 months ago
e7b3598f04
No need to have a separate localStorage key for home instance
12 months ago
0c727a6790
Fix more import style discrepancies
12 months ago
50eb673494
Fix some markup discrepancies
12 months ago
349579e318
Fix more code discrepancies
12 months ago
1023c2f90b
Fix more whitespace and comment discrepancies
12 months ago
7e5d00720b
Merge pull request #2391 from ClearlyClaire/glitch-soc/port-upstream-hashtags
...
Port upstream's hashtag handling to glitch-soc
12 months ago
cd3a636b7f
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb1c6
12 months ago
6a8623588a
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
12 months ago
c226d00490
Fix interaction between CWs and hashtag bars
12 months ago
7ae45676c8
Fix hashtag bar styling
12 months ago
45690b01d1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
12 months ago
fc514fa8c6
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
12 months ago
18462ee4b6
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
12 months ago
2ce03420d6
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
12 months ago
fe8d9f6221
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
12 months ago
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
12 months ago
3b210e093a
Fix more code style discrepancies
12 months ago
542d95c2bc
Fix import style discrepancy
12 months ago
8b24a9a507
Fix missed relative import discrepancy
12 months ago
b1f0457cb8
Fix whitespace and comment discrepancies
12 months ago
08ac91c40b
[Glitch] Fix follow relationships not loading after notifications fetch
...
Port 4f7f6b3922
12 months ago
103c0ca4f7
[Glitch] Hide loading bar on status interactions
...
Port eb2425b53b
12 months ago
21653beb30
Reduce more unwarranted differences with upstream
12 months ago
7b922c2d90
Reduce unwarranted differences with upstream
...
Ports part of 0758b00bfd897199910f
12 months ago
2f61b65b1e
Remove dead code
12 months ago
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
12 months ago
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
12 months ago
a97b722ad5
Reduce differences with upstream due to import style ( #2465 )
...
Fix relative / VS absolute style imports, and fix whitespace discrepancies
12 months ago
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
922f086253
Fix open status on media modal ( #27867 )
12 months ago
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
12 months ago
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )
1 year ago
bd6da814b5
Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element
1 year ago
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
ed79713f3a
Fix modal content not being selectable ( #27813 )
1 year ago
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
46a28fc41f
New Crowdin translations
1 year ago
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7840c6b75b
Do not try to update an undefined video element ( #27798 )
1 year ago
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )
1 year ago
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )
1 year ago
27cbdc6f22
Change alt text to empty string for avatars ( #21875 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
58f01a5c9a
Add volume saving/reuse to video player ( #27488 )
1 year ago
f476d9dab2
Fix the `notificationsUpdate` call ( #27758 )
1 year ago
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e4e752c26e
Adjust transform origin for favorite star ( #27700 )
1 year ago
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
1 year ago
3bf2a7296e
Use Immutable `Record` for accounts in Redux state ( #26559 )
1 year ago
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError ( #27647 )
1 year ago
277e6968f5
Use helpers to check environment in frontend ( #27633 )
1 year ago
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
1 year ago
9c8891b39a
Rewrite `AutosuggestTextarea` as Functional Component ( #27618 )
1 year ago
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
08bdd5751e
Fix account click on detailed status ( #27587 )
1 year ago
13d310e64d
Simplify column headers ( #27557 )
1 year ago
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
1 year ago
2d8f759a34
Add HTML lang attribute to preview card descriptions ( #27503 )
1 year ago
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
537442853f
Use a context to propagate column-related Props, and remove `forceUpdate` usage ( #27548 )
1 year ago
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
1 year ago
a4e6fe36cb
Add missing ban icons ( #27555 )
1 year ago
85d4846d8a
[Glitch] Fix `<ColumnBackButtonSlim>`
...
Port cb92cdf9af
1 year ago
6e9f89e5b6
Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc8a131fb7bc
1 year ago
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
1 year ago
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
cb92cdf9af
Fix `<ColumnBackButtonSlim>` ( #27540 )
1 year ago
f08ca3f042
Fix missing icon props ( #27539 )
1 year ago
bc3afb6311
Update `rails/ujs` delegate method usage ( #27538 )
1 year ago
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
1 year ago
b73e4b59fc
[Glitch] Fix history handling not properly handling states after update to react-router v5
...
Port 15182d1e5e
1 year ago
c6f990997d
[Glitch] Rewrite `emoji_unicode_mapping_light` to TS
...
Port 9482810703
1 year ago
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
1 year ago
8a131fb7bc
Fix `@rails/ujs` imports
1 year ago
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
1 year ago
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
69ea596e55
[Glitch] Fix explore page reloading when you navigate back to it in web UI
...
Port d9503a1965
1 year ago
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
1 year ago
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
1 year ago
9325cb5759
[Glitch] Convert `<Button>` to Typescript
...
Port 9d45a444f9
1 year ago
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
1 year ago
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
1 year ago
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
1 year ago
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9482810703
Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
1 year ago
e93a75f1a1
Rails 7.1 update ( #25963 )
1 year ago
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
1 year ago
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
1 year ago
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9d45a444f9
Convert `<Button>` to Typescript ( #27492 )
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
1288d4c9b6
th: Merge remote-tracking branch 'glitch/main' ( 5efa6ac771)
1 year ago
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
1 year ago
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
1 year ago
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
1 year ago
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
1 year ago
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
1 year ago
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
1 year ago
41f58e945c
[Glitch] The `class` props should be `className`
...
Port 10df97c542
1 year ago
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
1 year ago
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
1 year ago
10df97c542
The `class` props should be `className` ( #27462 )
1 year ago
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
1 year ago
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
1 year ago
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
1 year ago
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
1 year ago
ad44d832b8
Support "in:public" search filter ( #26976 )
1 year ago
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
1 year ago
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
1 year ago
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1 year ago
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
1 year ago
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
1 year ago
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
1 year ago
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
1 year ago
Claire
Renaud Chaput
Brian Holley
pajowu
Aleks Xhuvani
github-actions[bot]
mogaminsk
Matt Jankowski
Essem
Eugen Rochko
Christian Schmidt
Stanislas Signoud
たいち ひ
Steven Munn
Emelia Smith
fusagiko / takayamaki
Plastikmensch
Josh Goldberg ✨
Kouhai
Jeong Arm
neatchee
GitHub Actions
João Pedro Marques
Jasmin Johal
zunda
SouthFox
Simon Rapilly
kouhai
Brian Campbell