1488be7d96
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
2019-08-19 21:49:35 +02:00
2ca6b2bb6c
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
2019-08-15 22:49:00 +02:00
d37126fd03
Allow clicking behind preview ( #11576 )
2019-08-15 22:47:51 +02:00
1bea318197
Fix edit media modal on small screens, touch events ( #11573 )
2019-08-15 20:28:56 +02:00
dfe6059889
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
2019-08-15 17:24:45 +02:00
28636f43e4
Add OCR tool to media editing modal ( #11566 )
2019-08-15 15:13:26 +02:00
23f7afa562
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
2019-08-14 04:07:32 +02:00
c09ecbc53e
Add indicator of unread content to window title when web UI is out of focus ( #11560 )
...
Fix #1288
2019-08-13 12:22:16 +02:00
c4ae7aab6f
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
e823b49214
Fix "cancel follow request" button having unreadable text in web UI ( #11521 )
...
Fix #11478
2019-08-08 08:56:55 +02:00
04534604c6
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
2019-08-07 13:56:48 +02:00
9072fe5ab6
Add trends UI with admin and user settings ( #11502 )
2019-08-06 17:57:52 +02:00
cad2e6eb7a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-06 13:16:53 +02:00
1d8d553d8b
Revert "Change links in webUI to rewrite misleading links ( #11426 )" ( #11500 )
...
This reverts commit b31b232edf
2019-08-06 12:09:28 +02:00
27a0d02d0d
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
2019-08-06 11:59:58 +02:00
792d0dd470
Fix privacy dropdown active state when dropdown is placed on top of it ( #11495 )
2019-08-06 11:59:14 +02:00
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
c8fd823327
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
2019-08-03 19:10:50 +02:00
089c641020
Disable list title validation button when list title is empty ( #11475 )
2019-08-03 19:10:39 +02:00
2dee293c4c
Fix scroll to top in single column UI ( #11463 )
2019-08-01 19:17:17 +02:00
706a48ee1f
Fix column header scrolling with the page ( #11458 )
...
Regression from aa22b38
2019-08-01 12:26:58 +02:00
24968d20a0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
b31b232edf
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
2019-07-30 12:13:29 +02:00
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
8a4674f2c3
Add search results pagination to web UI ( #11409 )
...
* Add search results pagination to web UI
Fix #10737
* Fix code style issue
2019-07-27 05:49:50 +02:00
444796b69b
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
2019-07-23 10:51:07 +02:00
7de8c51873
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
2019-07-21 18:10:40 +02:00
249991c498
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
2019-07-19 18:26:49 +02:00
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
8df0022e66
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
2019-07-19 03:58:46 +02:00
729723f857
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 16:11:50 +02:00
9b1d3e4acb
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 06:30:47 +02:00
7039dca12c
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
...
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
2019-07-07 13:49:31 +02:00
c07cca4727
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.
2019-07-06 18:18:08 +02:00
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-04 16:21:39 +02:00
99924f282f
Memoize ancestorIds and descendantIds in detailed status view ( #11234 )
2019-07-02 16:03:54 +02:00
3922b518f7
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 21:36:50 +02:00
4f5b221be2
Display FTS warning based on actual search term, not the one being typed ( #11202 )
...
Follow-up to #11112
2019-06-28 19:29:11 +02:00
e64e6a03dd
Add categories for custom emojis ( #11196 )
...
Fix #7940
2019-06-28 15:54:10 +02:00
072158ee97
Fix swiping columns on mobile sometimes failing ( #11200 )
...
Fixes #9779
2019-06-28 13:52:15 +02:00
c8ba75b963
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 12:11:45 +02:00
ca8944728f
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
2019-06-27 21:12:26 +02:00
aaec64a500
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
2019-06-26 23:19:22 +02:00
3086c645fd
Add option to disable blurhash previews ( #11188 )
...
* Add option to disable blurhash previews
* Update option text
* Change options order
2019-06-26 19:33:04 +02:00
32a4494926
Scroll to compose form rather than reply indicator on focus ( #11182 )
2019-06-26 14:28:36 +02:00
5b20284f6f
Removed extra pipes from regex. ( #11181 )
2019-06-26 02:16:24 +02:00
ddd875ad99
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
2019-06-24 15:02:59 +02:00
6eb5241099
Change camera icon to paperclip icon in upload form ( #11149 )
2019-06-22 15:29:25 +02:00
f7f23b4a19
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
2019-06-19 23:42:38 +02:00
5717f75340
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-16 21:09:19 +02:00
Thibaut Girka
Eugen Rochko
koyu
PatOnTheBack