c060523dc2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
5 years ago
dc83169865
Improve focal point modal on mobile ( #11575 )
...
* Reduce padding around report modal and focal point modal title
* Increase max allowed height for focal point modal content
5 years ago
a886bf3808
Allow clicking behind preview ( #11576 )
5 years ago
375f2f3864
Fix edit media modal on small screens, touch events ( #11573 )
5 years ago
fe52fca65c
Fix tesseract.js being part of the common chunk ( #11571 )
...
* Fix tesseract.js being part of the common chunk
Besides being 620 KB large, it also causes a modules-related runtime
error in production...
* Fix code style issue
* Fix modules error
5 years ago
41b188dce6
Add OCR tool to media editing modal ( #11566 )
5 years ago
da208e7d9b
Add media editing modal ( #11563 )
...
Move media description input to a modal and unite that modal with
the focal point modal. Add a hint about choosing focal points, as
well as a preview of a 16:9 thumbnail. Enable the user to watch
the video next to the media description input.
Fix #8320
Fix #6713
5 years ago
a398045539
Add indicator of unread content to window title when web UI is out of focus ( #11560 )
...
Fix #1288
5 years ago
f0362fa0ee
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
aed7dca53b
Fix "cancel follow request" button having unreadable text in web UI ( #11521 )
...
Fix #11478
5 years ago
ff76f6de4f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
5 years ago
191392e5c3
Add trends UI with admin and user settings ( #11502 )
5 years ago
7a55d93244
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
15746b5107
Revert "Change links in webUI to rewrite misleading links ( #11426 )" ( #11500 )
...
This reverts commit a13ba1cc7b
5 years ago
13811f4d7b
Improve keyboard navigation in privacy dropdown ( #11492 )
...
* Trap tab in privacy dropdown
* Give focus back to last focused element when privacy dropdown menu closes
* Actually give back focus to the element that had it before clicking the dropdown
5 years ago
9f15da6b15
Fix privacy dropdown active state when dropdown is placed on top of it ( #11495 )
5 years ago
77416866a7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ebc78b6f2b
Change icon button styles to make hover/focus states more obvious ( #11474 )
...
* Change icon buttons styles to make hover/focused states more obvious
* Fix CW button size inconsistency
* Fix icon button background color consistency
5 years ago
5d32e422c0
Disable list title validation button when list title is empty ( #11475 )
5 years ago
293f789239
Fix scroll to top in single column UI ( #11463 )
5 years ago
cf45e39dd5
Fix column header scrolling with the page ( #11458 )
...
Regression from de4ead8
5 years ago
4973ba2d1f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
5 years ago
a13ba1cc7b
Change links in webUI to rewrite misleading links ( #11426 )
...
* [WiP] Show host for “misleading” links
* Disallow misleading targets which domain names are prefixes of link text
* Move decodeIDNA to app/javascript/mastodon/utils
* Add support for international domain names
* Change link origin tag color to darker text color
* Handle links to domains starting with www. as shortened by Mastodon
* [WiP] Ignore links that cannot be misread as URLs, rewrite other links
5 years ago
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
5119a0608d
Add search results pagination to web UI ( #11409 )
...
* Add search results pagination to web UI
Fix #10737
* Fix code style issue
5 years ago
579ccb0bb9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
5 years ago
99b3dd5b00
Play animated custom emoji on hover ( #11348 )
...
* Play animated custom emoji on hover in status
* Play animated custom emoji on hover in display names
* Play animated custom emoji on hover in bios/bio fields
* Add support for animation on hover on public pages emojis too
* Fix tests
* Code style cleanup
5 years ago
eecce7e59b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
5 years ago
de4ead8fc6
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
5 years ago
ee3ab5a51d
Added logout to dropdown menu ( #11353 )
...
* Added logout to dropdown menu
* Triggering build-and-test with empty commit as it seems it failed due to some internal failure
* Looks fine, ready to review
* Added changes from review
* method can be null without any problems
* Also target can be null
5 years ago
c56e6fd7a1
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
5 years ago
9dead08055
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
5 years ago
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
Thibaut Girka
Eugen Rochko
koyu
PatOnTheBack