d7a7f21646
Merge commit '64909cf0d988fb09917c41cfbc81b1e9a5132aca' into glitch-soc/merge-upstream
...
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
5 years ago
64909cf0d9
Only scroll to the compose form if it's not horizontally in the viewport ( #11246 )
...
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
5 years ago
9866c2bfff
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
eda4094171
Memoize ancestorIds and descendantIds in detailed status view ( #11234 )
5 years ago
6739c423ff
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
72dc1b3e60
Display FTS warning based on actual search term, not the one being typed ( #11202 )
...
Follow-up to #11112
5 years ago
1c612f24e4
Add categories for custom emojis ( #11196 )
...
Fix #7940
5 years ago
9668e42afd
Fix swiping columns on mobile sometimes failing ( #11200 )
...
Fixes #9779
5 years ago
8176d21824
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
0943e994dd
Add message telling FTS is disabled when no toot can be found because of this ( #11112 )
...
* Add message telling FTS is disabled when no toot can be found because of this
Fixes #11082
* Remove info icon and reword message
5 years ago
acbed64f3d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
5 years ago
4b3d91dc2c
Add option to disable blurhash previews ( #11188 )
...
* Add option to disable blurhash previews
* Update option text
* Change options order
5 years ago
1af85ca177
Scroll to compose form rather than reply indicator on focus ( #11182 )
5 years ago
9a216634a1
Removed extra pipes from regex. ( #11181 )
5 years ago
1177694c3e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
5 years ago
a317acfa72
Change camera icon to paperclip icon in upload form ( #11149 )
5 years ago
d7e2f554fb
Add audio uploads ( #11123 )
...
* Add audio uploads
Fix #4827
Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.
* Improve code style
5 years ago
4356f98a37
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
cdfeb86b7b
Do not scroll in the compose panel on single-column ( #11093 )
5 years ago
4741ea0029
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
770515a629
Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )
6 years ago
92ec50ad4b
List attachments in reply indicator and boost modal ( #10997 )
...
* Add media attachments list to boost modal
* Add attachment list to reply indicator
6 years ago
b988634e4e
Only show profile directory link when it's enabled ( #11064 )
6 years ago
5a158899bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
6 years ago
42a53e57d7
Fix emoji-button appearing above privacy-dropdown ( #11027 )
6 years ago
21acf681d2
Put poll options behind content warnings ( #10983 )
...
* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button
6 years ago
c7feecc715
Improve light theme ( #10992 )
6 years ago
5c1a46bdcf
Fix some React warnings ( #10989 )
6 years ago
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
96ac52dabd
Improvement variable height in single column layout ( #10917 )
...
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
6 years ago
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
6 years ago
03054b27e1
Fix poll visibility on public pages ( #10817 )
...
* Fix poll visibility on public pages
* Revert "Fix poll visibility on public pages"
This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.
* Revert "Change poll options to alphabetic letters when status text is hidden"
This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
6 years ago
d46668d34b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
6 years ago
9e238804ea
Fix null error in status component when determining showMedia state ( #10838 )
...
* Fix null error in status component when determining showMedia state
Also update the showMedia value if the status passed to the
component changes
* Refactor media visibility computation into a defaultMediaVisibility function
* Fix default media visibility with reblogs
6 years ago
66081c489f
Fix wrong redirect from getting started to home in advanced Web UI ( #10839 )
...
* update Ruby to 2.5.3
* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835 )
6 years ago
6d4af23a69
Improvements to the single column layout ( #10835 )
...
* Improvements to the single column layout
- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel
* Redirect from getting started to home when navigation panel is visible
6 years ago
7ee189fa60
Add a keyboard shortcut to hide/show media ( #10647 )
...
* Move control of media visibility to parent component
* Add keyboard shortcut to toggle media visibility
6 years ago
a1bceb2cb6
Add responsive panels to the single-column layout ( #10820 )
...
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
6 years ago
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
Thibaut Girka
Eugen Rochko
PatOnTheBack
koyu
mayaeh
Wenceslao Páez Chávez
Takeshi Umeda
Jeong Arm
Hanage999