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
ThibG
eda4094171
Memoize ancestorIds and descendantIds in detailed status view ( #11234 )
2019-07-02 16:03:54 +02:00
Thibaut Girka
6739c423ff
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 21:36:50 +02:00
ThibG
72dc1b3e60
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
Eugen Rochko
1c612f24e4
Add categories for custom emojis ( #11196 )
...
Fix #7940
2019-06-28 15:54:10 +02:00
ThibG
9668e42afd
Fix swiping columns on mobile sometimes failing ( #11200 )
...
Fixes #9779
2019-06-28 13:52:15 +02:00
Thibaut Girka
8176d21824
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 12:11:45 +02:00
ThibG
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
2019-06-27 21:12:26 +02:00
Thibaut Girka
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
2019-06-26 23:19:22 +02:00
ThibG
4b3d91dc2c
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
ThibG
1af85ca177
Scroll to compose form rather than reply indicator on focus ( #11182 )
2019-06-26 14:28:36 +02:00
PatOnTheBack
9a216634a1
Removed extra pipes from regex. ( #11181 )
2019-06-26 02:16:24 +02:00
Thibaut Girka
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
2019-06-24 15:02:59 +02:00
koyu
a317acfa72
Change camera icon to paperclip icon in upload form ( #11149 )
2019-06-22 15:29:25 +02:00
Eugen Rochko
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
2019-06-19 23:42:38 +02:00
Thibaut Girka
4356f98a37
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-16 21:09:19 +02:00
ThibG
cdfeb86b7b
Do not scroll in the compose panel on single-column ( #11093 )
2019-06-16 18:46:55 +02:00
Thibaut Girka
4741ea0029
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-13 22:23:20 +02:00
ThibG
770515a629
Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )
2019-06-13 17:07:43 +02:00
ThibG
92ec50ad4b
List attachments in reply indicator and boost modal ( #10997 )
...
* Add media attachments list to boost modal
* Add attachment list to reply indicator
2019-06-13 17:04:52 +02:00
ThibG
b988634e4e
Only show profile directory link when it's enabled ( #11064 )
2019-06-13 00:16:27 +02:00
Thibaut Girka
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
2019-06-10 18:59:53 +02:00
mayaeh
42a53e57d7
Fix emoji-button appearing above privacy-dropdown ( #11027 )
2019-06-10 12:27:17 +02:00
ThibG
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
2019-06-08 17:40:59 +02:00
Eugen Rochko
c7feecc715
Improve light theme ( #10992 )
2019-06-08 10:23:41 +02:00
Eugen Rochko
5c1a46bdcf
Fix some React warnings ( #10989 )
2019-06-07 17:15:18 +02:00
Thibaut Girka
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
Wenceslao Páez Chávez
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
2019-06-06 13:40:17 +02:00
Eugen Rochko
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
2019-06-06 13:04:49 +02:00
Takeshi Umeda
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
2019-06-06 12:30:14 +02:00
Jeong Arm
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
2019-06-05 15:29:45 +02:00
Thibaut Girka
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
Eugen Rochko
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
2019-06-04 19:50:38 +02:00
Thibaut Girka
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
Takeshi Umeda
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
2019-06-02 10:05:54 +02:00
Thibaut Girka
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
Eugen Rochko
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
2019-05-29 17:33:35 +03:00
ThibG
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
2019-05-29 17:33:15 +03:00
Thibaut Girka
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
Eugen Rochko
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
2019-05-27 21:58:41 +02:00
Takeshi Umeda
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.
2019-05-26 23:13:29 +02:00
Thibaut Girka
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”.
2019-05-26 15:41:40 +02:00
Eugen Rochko
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
2019-05-26 13:48:16 +02:00
Hanage999
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 )
2019-05-26 12:22:33 +02:00
Eugen Rochko
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
2019-05-26 02:55:37 +02:00
ThibG
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
2019-05-25 23:20:51 +02:00
Eugen Rochko
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
2019-05-25 21:27:00 +02:00
Thibaut Girka
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
Eugen Rochko
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
2019-05-23 20:01:10 +02:00
Thibaut Girka
d445d5833e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
Eugen Rochko
f9ca3d62b6
Add forceSingleColumn
prop to <UI />
( #10807 )
...
* Move TabsBar rendering logic from CSS to the ColumnsArea component
* Add forceSingleColumn mode
* Add unread notifications counter to tabs bar
* Add toggle to control `forceSingleColumn`
* Increase paddings in mobile layout responsively at large sizes
2019-05-23 01:35:22 +02:00
Thibaut Girka
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
Hinaloe
4de9bd3870
fix isSubmitting
prop case ( #10785 )
2019-05-19 18:41:41 +02:00