tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,451 Commits 10 Branches 0 Tags
d101438b9d1bd827c191605cb21d58f83de2124d
Commit Graph
882 Commits
Author SHA1 Message Date
Eugen RochkoandGitHub bc5678d015 Change conversations UI (#11896) 
Fix #11414, fix #9860, fix #10434
 2019-09-21 20:01:16 +02:00
Eugen RochkoandGitHub ba0de8fb68 Fix updates being hidden behind pending items on unmounted components (#11898) 2019-09-21 09:12:13 +02:00
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
 2019-09-18 17:25:56 +02:00
Yamagishi KazutoshiandEugen Rochko 0627252b30 Check existence of timeline state in community timeline (#11880) 2019-09-18 04:02:21 +02:00
Eugen RochkoandGitHub bdeff5ae15 Fix web UI allowing uploads past status limit via drag & drop (#11863) 
Fix #11659
 2019-09-16 20:42:19 +02:00
ThibGandEugen Rochko f109867578 Fix “slow mode” issues (#11859) 
* Fix weird scroll-jumping behavior with pending items

* Treat pending items as unread items

* Fix scroll position being altered because of the “X new items” button
 2019-09-16 15:45:06 +02:00
ThibGandEugen Rochko c00ab575b7 Fix media description button being disabled at 420 characters instead of 1500 (#11836) 2019-09-14 00:52:56 +02:00
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
Eugen RochkoandGitHub b6381bdc7d Change max length of media descriptions from 420 to 1500 characters (#11819) 
Fix #11658
 2019-09-13 16:00:34 +02:00
Eugen RochkoandGitHub e445a8af64 Add timeline read markers API (#11762) 
Fix #4093
 2019-09-06 13:55:51 +02:00
Thibaut Girka 5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
mayaehandEugen Rochko 1f22b8197c Integrate translation strings for the Profile Directory. (#11722) 
Run `yarn manage:translations en`
 2019-09-02 18:12:27 +02:00
ThibGandEugen Rochko 34eac5a1ec Fix custom emoji animation on hover in WebUI directory bios (#11716) 2019-09-01 20:04:35 +02:00
Thibaut Girka 9044a2b051 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 RochkoandGitHub 9871904172 Change layout of public profile directory to be the same as in web UI (#11705) 2019-08-30 07:41:16 +02:00
ThibGandEugen Rochko 6914482d0a Change detailed status child ordering to sort self-replies on top (#11686) 
Fixes #11679
 2019-08-30 01:57:38 +02:00
Eugen RochkoandGitHub cb447b28c4 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 48b8a1f414 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
ThibGandEugen Rochko 81f864d4da 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
ThibGandEugen Rochko fd3d45d38f 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
ThibGandEugen Rochko bd4099d976 Change window resize handler to switch to/from mobile layout as soon as needed (#11656) 2019-08-25 15:48:50 +02:00
Eugen RochkoandGitHub 2e99e3cab3 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 RochkoandGitHub e72bac7576 Fix public page crash due to audio player, fix unpause in audio player (#11652) 2019-08-25 02:13:40 +02:00
Eugen RochkoandGitHub 4190e31626 Add audio player (#11644) 2019-08-23 22:38:02 +02:00
Eugen RochkoandGitHub 4ef8d8b77c Add header to trends section and change refresh rate to 15 minutes (#11641) 2019-08-23 05:05:21 +02:00
ThibGandEugen Rochko d857d0d14d Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631) 2019-08-21 00:18:07 +02:00
Thibaut Girka 81d2d71094 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-20 20:30:44 +02:00
ThibGandEugen Rochko b48c7ee059 Fix handling of audio files in account media gallery (#11629) 
Fixes #11627
 2019-08-20 19:46:41 +02:00
Thibaut Girka 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
ThibGandEugen Rochko 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
ThibGandEugen Rochko d37126fd03 Allow clicking behind preview (#11576) 2019-08-15 22:47:51 +02:00
Eugen RochkoandGitHub 1bea318197 Fix edit media modal on small screens, touch events (#11573) 2019-08-15 20:28:56 +02:00
Eugen RochkoandGitHub 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
Eugen RochkoandGitHub 28636f43e4 Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
Eugen RochkoandGitHub 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
Eugen RochkoandGitHub 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
Thibaut Girka c4ae7aab6f Merge branch 'master' into glitch-soc/merge-upstream 2019-08-12 16:24:22 +02:00
Eugen RochkoandGitHub e823b49214 Fix "cancel follow request" button having unreadable text in web UI (#11521) 
Fix #11478
 2019-08-08 08:56:55 +02:00
Thibaut Girka 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
Eugen RochkoandGitHub 9072fe5ab6 Add trends UI with admin and user settings (#11502) 2019-08-06 17:57:52 +02:00
Thibaut Girka cad2e6eb7a Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
Eugen RochkoandGitHub 1d8d553d8b Revert "Change links in webUI to rewrite misleading links (#11426)" (#11500) 
This reverts commit b31b232edf.
 2019-08-06 12:09:28 +02:00
ThibGandEugen Rochko 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
ThibGandEugen Rochko 792d0dd470 Fix privacy dropdown active state when dropdown is placed on top of it (#11495) 2019-08-06 11:59:14 +02:00
Thibaut Girka e50554391a Merge branch 'master' into glitch-soc/merge-upstream 2019-08-05 13:13:28 +02:00
ThibGandEugen Rochko 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
ThibGandEugen Rochko 089c641020 Disable list title validation button when list title is empty (#11475) 2019-08-03 19:10:39 +02:00
Eugen RochkoandGitHub 2dee293c4c Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
Eugen RochkoandGitHub 706a48ee1f Fix column header scrolling with the page (#11458) 
Regression from aa22b38
 2019-08-01 12:26:58 +02:00
Thibaut Girka 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