Jeremy Kescher
|
5be3fb3d66
|
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
|
2024-01-02 12:16:35 +01:00 |
|
Matt Jankowski
|
ee83d5c760
|
Enable the eslint react/no-unknown-property rule (#28217)
|
2023-12-06 13:42:12 +00:00 |
|
Eugen Rochko
|
134de736dc
|
Change icons in web UI (#27385)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
|
2023-10-24 17:45:08 +00:00 |
|
Renaud Chaput
|
1b70d7ed7c
|
Upgrade to react-router v5 (#25047)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2023-10-19 19:44:55 +02:00 |
|
Renaud Chaput
|
126cd7705d
|
Do not display the navigation banner in the logo container (#27476)
|
2023-10-19 19:36:08 +02:00 |
|
Renaud Chaput
|
10df97c542
|
The class props should be className (#27462)
|
2023-10-19 13:22:44 +02:00 |
|
Stanislas Signoud
|
40b69cc1cd
|
Add an explanation banner on switching to single column mode (#26019)
|
2023-08-31 12:18:46 +02:00 |
|
gunchleoc
|
217ef7f2af
|
Replace 'favourite' by 'favorite' for American English (#26009)
|
2023-07-21 19:09:13 +02:00 |
|
Stanislas Signoud
|
5fad7bd58a
|
Change links in multi-column mode so tabs are open in single-column mode (#25893)
|
2023-07-13 17:18:09 +02:00 |
|
Eugen Rochko
|
ceeb2b8c41
|
Fix explore page being inaccessible when opted-out of trends in web UI (#25716)
|
2023-07-08 20:00:12 +02:00 |
|
Local User
|
0527458f38
|
Merge branch 'upstream/main' into develop
|
2023-07-07 01:25:26 +02:00 |
|
Claire
|
cea9db5a0b
|
Change local and federated timelines to be in a single firehose column (#25641)
|
2023-07-02 00:05:10 +02:00 |
|
Jeremy Kescher
|
4920ccb302
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-05-27 12:23:36 +02:00 |
|
Renaud Chaput
|
d27216dc46
|
Enforce import order with ESLint (#25096)
|
2023-05-23 17:15:17 +02:00 |
|
Renaud Chaput
|
5a16bd7bf4
|
Use JSX syntax for Fragments (#25093)
|
2023-05-23 11:47:36 +02:00 |
|
Renaud Chaput
|
8f66126b10
|
Use the new JSX transform (#25064)
|
2023-05-23 10:52:27 +02:00 |
|
たいち ひ
|
2d5e257938
|
Rewrite logo.tsx as FC (#24909)
|
2023-05-10 08:58:21 +02:00 |
|
Jeremy Kescher
|
68101baae1
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# app/controllers/settings/preferences_controller.rb
# app/javascript/mastodon/utils/resize_image.js
# app/lib/user_settings_decorator.rb
# app/models/media_attachment.rb
# app/models/user.rb
# app/views/settings/preferences/appearance/show.html.haml
# app/workers/scheduler/indexing_scheduler.rb
# config/settings.yml
# db/schema.rb
|
2023-04-03 21:50:15 +02:00 |
|
Eugen Rochko
|
68a192e718
|
Change "direct message" nomenclature to "private mention" in web UI (#24248)
|
2023-03-30 15:16:20 +02:00 |
|
Jeremy Kescher
|
722b6697d7
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-03-28 17:31:34 +02:00 |
|
Yamagishi Kazutoshi
|
d1b057a0ac
|
Remove legacy decorators syntax (#18357)
|
2023-03-24 03:17:53 +01:00 |
|
Jeremy Kescher
|
ddc4022845
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
|
2023-03-15 14:13:29 +01:00 |
|
Jeremy Kescher
|
7318b74ebf
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
|
2023-03-05 12:34:16 +01:00 |
|
Terry Garcia
|
a1347f456e
|
Switched bookmark and favourites around (#23701)
|
2023-03-03 20:37:49 +01:00 |
|
Renaud Chaput
|
44a7d87cb1
|
Rename JSX files with proper .jsx extension (#23733)
|
2023-02-20 03:20:59 +01:00 |
|