Thibaut Girka
741b53651e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
Eugen Rochko
b47119eb61
Change layout of public profile directory to be the same as in web UI ( #11705 )
2019-08-30 07:41:16 +02:00
ThibG
accac63c88
Change detailed status child ordering to sort self-replies on top ( #11686 )
...
Fixes #11679
2019-08-30 01:57:38 +02:00
Eugen Rochko
79922ae20f
Add profile directory to web UI ( #11688 )
...
* Add profile directory to web UI
* Add a line of bio to the directory
2019-08-30 00:14:36 +02:00
Thibaut Girka
449a0727a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
ThibG
6fc1a84958
Add special alert for throttled requests ( #11677 )
...
* Add special alert for throttled requests
* Use an extra attribute instead of an array
2019-08-27 16:50:39 +02:00
ThibG
d255ce2f1a
Add confirmation modal when logging out from the web app ( #11671 )
...
* [WiP] Add a confirmation modal before logging out from the web interface
* Add confirmation to logout link in getting started footer
* Please CodeClimate
2019-08-26 18:24:10 +02:00
ThibG
15a82d48ea
Change window resize handler to switch to/from mobile layout as soon as needed ( #11656 )
2019-08-25 15:48:50 +02:00
Eugen Rochko
eaa759ffd4
Fix more visual issues with the audio player ( #11654 )
...
* Fix more visual issues with the audio player
- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded
* Fix code style issue
2019-08-25 15:09:19 +02:00
Eugen Rochko
c8df53b75f
Fix public page crash due to audio player, fix unpause in audio player ( #11652 )
2019-08-25 02:13:40 +02:00
Eugen Rochko
f13761d84b
Add audio player ( #11644 )
2019-08-23 22:38:02 +02:00
Eugen Rochko
cf56532ced
Add header to trends section and change refresh rate to 15 minutes ( #11641 )
2019-08-23 05:05:21 +02:00
ThibG
db5c84ce4b
Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
2019-08-21 00:18:07 +02:00
Thibaut Girka
0f22699c02
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-20 20:30:44 +02:00
ThibG
73b23ef7be
Fix handling of audio files in account media gallery ( #11629 )
...
Fixes #11627
2019-08-20 19:46:41 +02:00
Thibaut Girka
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
2019-08-19 21:49:35 +02:00
ThibG
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
2019-08-15 22:49:00 +02:00
ThibG
a886bf3808
Allow clicking behind preview ( #11576 )
2019-08-15 22:47:51 +02:00
Eugen Rochko
375f2f3864
Fix edit media modal on small screens, touch events ( #11573 )
2019-08-15 20:28:56 +02:00
Eugen Rochko
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
2019-08-15 17:24:45 +02:00
Eugen Rochko
41b188dce6
Add OCR tool to media editing modal ( #11566 )
2019-08-15 15:13:26 +02:00
Eugen Rochko
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
2019-08-14 04:07:32 +02:00
Eugen Rochko
a398045539
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
Thibaut Girka
f0362fa0ee
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
Eugen Rochko
aed7dca53b
Fix "cancel follow request" button having unreadable text in web UI ( #11521 )
...
Fix #11478
2019-08-08 08:56:55 +02:00
Thibaut Girka
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
2019-08-07 13:56:48 +02:00
Eugen Rochko
191392e5c3
Add trends UI with admin and user settings ( #11502 )
2019-08-06 17:57:52 +02:00
Thibaut Girka
7a55d93244
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-06 13:16:53 +02:00
Eugen Rochko
15746b5107
Revert "Change links in webUI to rewrite misleading links ( #11426 )" ( #11500 )
...
This reverts commit a13ba1cc7b
.
2019-08-06 12:09:28 +02:00
ThibG
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
2019-08-06 11:59:58 +02:00
ThibG
9f15da6b15
Fix privacy dropdown active state when dropdown is placed on top of it ( #11495 )
2019-08-06 11:59:14 +02:00
Thibaut Girka
77416866a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
ThibG
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
2019-08-03 19:10:50 +02:00
ThibG
5d32e422c0
Disable list title validation button when list title is empty ( #11475 )
2019-08-03 19:10:39 +02:00
Eugen Rochko
293f789239
Fix scroll to top in single column UI ( #11463 )
2019-08-01 19:17:17 +02:00
Eugen Rochko
cf45e39dd5
Fix column header scrolling with the page ( #11458 )
...
Regression from de4ead8
2019-08-01 12:26:58 +02:00
Thibaut Girka
4973ba2d1f
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
ThibG
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
2019-07-30 12:13:29 +02:00
Thibaut Girka
6c7a3268c9
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
Eugen Rochko
5119a0608d
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
Thibaut Girka
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
2019-07-23 10:51:07 +02:00
ThibG
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
2019-07-21 18:10:40 +02:00
Thibaut Girka
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
2019-07-19 18:26:49 +02:00
Eugen Rochko
de4ead8fc6
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
koyu
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
2019-07-19 03:58:46 +02:00
Eugen Rochko
c56e6fd7a1
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 16:11:50 +02:00
Eugen Rochko
9dead08055
Add option to disable real-time updates in web UI ( #9984 )
...
Fix #9031
Fix #7913
2019-07-16 06:30:47 +02:00
Thibaut Girka
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.
2019-07-07 13:49:31 +02:00
ThibG
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.
2019-07-06 18:18:08 +02:00
Thibaut Girka
9866c2bfff
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-04 16:21:39 +02:00