9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
5 years ago
53afb61c84
Fix media editing modal changing dimensions when image loads ( #12131 )
5 years ago
c453888616
Fix performance of home feed regeneration ( #12084 )
...
Fetching statuses from all followed accounts at once takes too long
within Postgres. Fetching them one by one and merging in Ruby
could be a lot less resource-intensive
Because the query for dynamically fetching the home timeline is so
heavy, we can no longer offer it when the home timeline is missing
5 years ago
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
5 years ago
9c4f1fb4e1
Fix audio attachments opening in video modal from media tab in web UI ( #12056 )
...
Fix video attachments having a GIF label in media tab in web UI
5 years ago
4137247274
Fix issues in RTL layout in web UI ( #12060 )
5 years ago
f9c94be74c
Fix media editing modal and profile directory in light theme ( #12059 )
...
Also:
- Fix embed modal in light theme
- Fix confirmation modal in light theme
5 years ago
27817baca5
Fix bad word breaking on conversations ( #12039 )
...
* Fix bad word breaking
* Fix style
* Fix style
5 years ago
55b6f9202a
Add error description and button to copy stack trace to web UI ( #12033 )
5 years ago
8811f37949
Fix long domain block descriptions breaking table layout ( #12029 )
5 years ago
7c6fef81a4
Fix and remove ugly css around the conversation component ( #12022 )
5 years ago
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
5 years ago
fdd1848c7c
Add explanation to mute dialog, refactor and clean up mute/block UI ( #11992 )
...
* Add some explanation to the mute modal dialog
* Remove `isSubmitting` from mute modal code, this wasn't used
* Refactor block modal
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor SCSS a bit
* Put mute modal toggle to the same side as in the report dialog for consistency
* Reword mute explanation
* Fix mute explanation styling
* Left-align all text in mute confirmation modal
5 years ago
e4289a50fc
Fix muted text color not applying to all text ( #11996 )
...
Pleroma generates polls without p tag
5 years ago
7b7c50f124
Fix public list of domain blocks being too verbose on about page ( #11967 )
5 years ago
03d3481688
Fix vote checkmark in poll results ( #11990 )
5 years ago
45bdb2cea4
Fix overflow on conversations ( #11965 )
...
* Fix: overflow on conversations
* Fix: overflow on conversations
5 years ago
c596206f8c
Show user what options they have voted ( #11195 )
...
* Add own_votes field to poll results in REST API
Fixes #10679
* Display user votes in WebUI
* Update styling
* Add vote checkmark to public pages
5 years ago
ffbd6a2f27
Fix ugly TOC when title is too long ( #11916 )
...
* Fix ugly TOC when title is too long
* Fix TOC using grid, minmax
5 years ago
5d5af651f1
Change conversations UI ( #11896 )
...
Fix #11414 , fix #9860 , fix #10434
5 years ago
53ceb703b3
Fix page body not being scrollable in admin layout ( #11893 )
...
Hide navigation behind hamburger icon on small screens in admin layout
5 years ago
bd3e1b383e
Fix left side of single column layout being cropped on smaller screens ( #11894 )
...
Fix #11476
5 years ago
21cca10a6e
Fix placeholder colors for inputs not being explicitly defined ( #11890 )
...
Fix #11841
5 years ago
61442032a2
Add table of contents to about page ( #11885 )
...
Move public domain blocks information to about page
5 years ago
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
5 years ago
1781358bd9
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
...
Fix #3961
5 years ago
df8b1b3547
Fix poll options checkboxes/radio buttons not being vertically centered ( #11833 )
5 years ago
c5836cc5de
Fix profile fields overflowing page width ( #11828 )
...
Fix #11720
5 years ago
2e38d889a3
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)
5 years ago
f8e09ac4a8
Fix display of long poll options ( #11717 )
5 years ago
8352a0f352
Fix unused CSS ( #11824 )
...
Fix #11689
5 years ago
a503e791f4
Fix flavour screenshot styling in vanilla flavour
5 years ago
25fb124ee6
Add batch actions and categories to admin UI for custom emojis ( #11793 )
5 years ago
fef7f3b6d5
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
5 years ago
7799c7c75f
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
5 years ago
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
f6cd27f41f
Fix line breaks in hashtag autosuggestions in web UI ( #11764 )
5 years ago
7ef93513f7
Change account deletion page to have better explanations ( #11753 )
...
Fix deletion of unconfirmed account not freeing up the username
Add prefill of logged-in user's email in the reconfirmation form
5 years ago
acf168f1a2
Fix uncached media in web UI not being clickable ( #11745 )
5 years ago
06f49d9cf2
Fix Mastodon logo style on hover on public pages' footer ( #11735 )
...
Fixes #11690
5 years ago
c5e4f4e0c1
Fix height of dashboard counters ( #11736 )
5 years ago
59d873e1e5
Add "not available" label on unknown media attachments ( #11715 )
5 years ago
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.
5 years ago
b47119eb61
Change layout of public profile directory to be the same as in web UI ( #11705 )
5 years ago
79922ae20f
Add profile directory to web UI ( #11688 )
...
* Add profile directory to web UI
* Add a line of bio to the directory
5 years ago
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.
5 years ago
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
5 years ago
f13761d84b
Add audio player ( #11644 )
5 years ago
cf56532ced
Add header to trends section and change refresh rate to 15 minutes ( #11641 )
5 years ago
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
Thibaut Girka
Eugen Rochko
Cutls
trwnh
Jeong Arm