Jeremy Kescher
|
9eb149477a
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-05-06 00:39:56 +02:00 |
|
Eugen Rochko
|
290e4aba31
|
Add lines to threads in web UI (#24549)
|
2023-04-24 08:07:03 +02:00 |
|
Eugen Rochko
|
0461f83320
|
Add new onboarding flow to web UI (#24619)
|
2023-04-23 22:24:53 +02:00 |
|
Jeremy Kescher
|
f3953eee78
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-04-23 20:49:47 +02:00 |
|
Nick Schonning
|
d02aa274be
|
typo: collapsable -> collapsible (#24521)
|
2023-04-14 11:01:23 +02:00 |
|
Jeremy Kescher
|
1e866e57ac
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-04-10 08:14:20 +02:00 |
|
Nick Schonning
|
ec0c104bf2
|
Ensure tabIndex is number instead of string (#24409)
|
2023-04-04 16:33:44 +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
|
047286d54e
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
|
2023-03-06 16:33:21 +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 |
|
Christian Schmidt
|
d3eefead30
|
Add lang attribute to media and poll options (#23891)
|
2023-02-26 20:13:27 +01:00 |
|
Christian Schmidt
|
62c4aecf8f
|
Make larger part of status clickable (#23621)
|
2023-02-20 08:11:23 +01:00 |
|
Renaud Chaput
|
44a7d87cb1
|
Rename JSX files with proper .jsx extension (#23733)
|
2023-02-20 03:20:59 +01:00 |
|