about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
2019-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-12-01Fix conversations not having an unread indicator in web UI (#12506)Eugen Rochko
2019-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-29Fix counter sizing (#12446)Sasha Sorokin
Counter size is currently set to strict 33.3% width, but with it counter may break in other languages than English. For example it is already broken on Gargron's profile on mastodon.social using Russian locale. This commit changes "width" to "min-width", so counters still displayed correctly, but if they need more width to fit text, they are now allowed to take as many width as they need.
2019-11-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-22Fix blur behind closed registration message (#12442)ThibG
* Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
2019-11-13Add bookmarks (#7107)ThibG
* Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red
2019-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's
2019-11-07Minor improvements to poll composing UI (#12319)ThibG
- Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width
2019-10-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb
2019-10-25Add download button to audio and video players (#12179)Nima Boscarino
* Add download button for audio player * Add download button for video player * fix padding for download button in Audio component
2019-10-24Replace fav icon animation with CSS (#12175)ThibG
Fixes #12151
2019-10-24don't show outline of full-screen video (#12176)Hinaloe
2019-10-24Fix batch actions being hidden from mobile view (#12183)ThibG
On mobile, batch actions are hidden from the settings/admin interface, but there are several places those actions can only be performed through batch actions. This may not look great, but at least it makes the actions available again.
2019-10-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-10-10Fix media editing modal changing dimensions when image loads (#12131)Eugen Rochko
2019-10-06Fix performance of home feed regeneration (#12084)Eugen Rochko
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
2019-10-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-10-03Fix audio attachments opening in video modal from media tab in web UI (#12056)Eugen Rochko
Fix video attachments having a GIF label in media tab in web UI
2019-10-03Fix issues in RTL layout in web UI (#12060)Eugen Rochko
2019-10-03Fix media editing modal and profile directory in light theme (#12059)Eugen Rochko
Also: - Fix embed modal in light theme - Fix confirmation modal in light theme
2019-10-02Fix bad word breaking on conversations (#12039)Cutls
* Fix bad word breaking * Fix style * Fix style
2019-10-01Add error description and button to copy stack trace to web UI (#12033)Eugen Rochko
2019-10-01Fix long domain block descriptions breaking table layout (#12029)Eugen Rochko
2019-09-30Fix and remove ugly css around the conversation component (#12022)Cutls
2019-09-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-29Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)ThibG
* 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
2019-09-29Fix muted text color not applying to all text (#11996)trwnh
Pleroma generates polls without p tag
2019-09-29Fix public list of domain blocks being too verbose on about page (#11967)Eugen Rochko
2019-09-28Fix vote checkmark in poll results (#11990)ThibG
2019-09-27Fix overflow on conversations (#11965)Cutls
* Fix: overflow on conversations * Fix: overflow on conversations
2019-09-22Show user what options they have voted (#11195)ThibG
* 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
2019-09-22Fix ugly TOC when title is too long (#11916)Jeong Arm
* Fix ugly TOC when title is too long * Fix TOC using grid, minmax
2019-09-21Change conversations UI (#11896)Eugen Rochko
Fix #11414, fix #9860, fix #10434
2019-09-20Fix page body not being scrollable in admin layout (#11893)Eugen Rochko
Hide navigation behind hamburger icon on small screens in admin layout
2019-09-20Fix left side of single column layout being cropped on smaller screens (#11894)Eugen Rochko
Fix #11476
2019-09-19Fix placeholder colors for inputs not being explicitly defined (#11890)Eugen Rochko
Fix #11841
2019-09-19Add table of contents to about page (#11885)Eugen Rochko
Move public domain blocks information to about page
2019-09-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
2019-09-18Add password challenge to 2FA settings, e-mail notifications (#11878)Eugen Rochko
Fix #3961
2019-09-16Fix poll options checkboxes/radio buttons not being vertically centered (#11833)ThibG
2019-09-13Fix profile fields overflowing page width (#11828)Eugen Rochko
Fix #11720
2019-09-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-13Fix display of long poll options (#11717)ThibG
2019-09-13Fix unused CSS (#11824)Eugen Rochko
Fix #11689
2019-09-10Fix flavour screenshot styling in vanilla flavourThibaut Girka
2019-09-09Add batch actions and categories to admin UI for custom emojis (#11793)Eugen Rochko
2019-09-09Add account bio to account admin view (#11473)ThibG
* Add account bio to account admin view * Change styling to make bio fields / content more readable
2019-09-09Add batch approve/reject for pending hashtags in admin UI (#11791)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-22 22:40:10 +0000