1053 Commits (befe8c72ddd3b427ccf1489a6de6bcc23b6a55f5)

Author	SHA1	Message	Date
Thibaut Girka	369201a425	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	3adc722d1c	Change how unread announcements are handled (#13020) ... * Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read * Change how unread announcements are counted in UI * Add unread marker to announcements and mark announcements as unread as they are displayed * Fixups	5 years ago
Sasha Sorokin	50cd73e5d7	Add "Show thread" button to public profiles (#13000) ... This adds "Show thread" button to the status view which is used in profiles. The logic to display the button is mimicking logic in web app available at app/javascript/mastodon/components/status.js#L439. * The little change in components CSS required to remove enforced underline for all links on public pages on our button.	5 years ago
Eugen Rochko	bba0269d97	Fix mascot being too large, and a code style issue (#13002)	5 years ago
Thibaut Girka	44744e3ce1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Sasha Sorokin	04459687f8	Fix regressions caused by #12961 (#12961) ... This commit attempts to fix most of regressions caused by #12961 pull request which added even spread of space between tabs. The following fixes were done: - Don't hide overflow in tabs As tabs use ::after and ::before pseudo-elements to create arrow on the bottom of selected tab, "overflow: hidden" will cause this arrow to look split from the bottom container. For the future we probably should use slider element instead, which would align according to currently selected tab, instead of relying on pseudo-elements. Such method would also allow smooth transitions. - Disallow wrapping tab text on insufficient space This would fix some unwanted behavior[1] when on insufficient width, renderer might attempt wrapping text to not overtake others' space. [1]: https://mastodon.social/@Gargron/103546083813829165	5 years ago
Eugen Rochko	305abc9e05	Fix design of announcements in admin UI (#12989)	5 years ago
Thibaut Girka	c56a504d11	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.	5 years ago
Eugen Rochko	c2dfd5e4e2	Revert "Avoid using uppercase text-transform (#12684)" (#12987) ... This reverts commit 7da54001fe.	5 years ago
Eugen Rochko	2f8c3c17ee	Fix link colors in announcements (#12965)	5 years ago
ThibG	389e3f6094	Fix status overflowing in report dialog (#12959) ... Fixes #12942	5 years ago
Thibaut Girka	3d9310bf3f	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	90b13ffd00	Fix “new items glow” being displayed above settings and announcements (#12958)	5 years ago
ThibG	c06d2ff437	Fix spurious error and incorrect state change when adding a reaction twice (#12957) ... * Fix spurious error and incorrect state change when adding a reaction twice * Remove superfluous top border for announcements box	5 years ago
Thibaut Girka	27ddcddcd3	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	48c55b6392	Improve announcements design (#12954) ... * Move announcements above scroll container; add button to temporarily hide them * Remove interface for dismissing announcements * Display number of unread announcements * Count unread announcements accurately * Fix size of announcement box not fitting the currently displayed announcement * Fix announcement box background color to match button color	5 years ago
Thibaut Girka	61f699c0e9	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	76f1ed834e	Add number animations (#12948)	5 years ago
Eugen Rochko	b89e6cfe70	Change font size of announcements to be the same as statuses (#12949)	5 years ago
Sasha Sorokin	14ca559705	Evenly spread space between tabs (#12944) ... This commit fixes uneven spread of space between the tabs in profiles or notifications (filters). The problem was that links and buttons shown as blocks had their width determined according to the content inside of them, so if one tab has more text content than another, it is going to take over others space, which is uneven and results in incorrectly aligned (?) tabs display. By specifying the size of 100% for each tab, parent container will be forced to divide available space by the number of elements and evenly give each child fixed space, "text-align: center" then doing its best job to keep tabs text centered in that space. This relatively fixes the problem, but will introduce another one - when the block has more content that its width allows to have, in this scenario the text should be wrapped or will be displayed over the other elements, but I see this more as translators' problem. Still, for this case "overflow: hidden" is added and any unfitting text will be cut out.	5 years ago
Thibaut Girka	9adeaf2bfc	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system	5 years ago
Eugen Rochko	f52c988e12	Add announcements (#12662) ... * Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter	5 years ago
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	5 years ago
Sasha Sorokin	7da54001fe	Avoid using uppercase text-transform (#12684) ... One user suggested that the loading indicator should not be written ALL CAPS, at first it was thought this change is very minor, but then a few other people asked agreed on the same thing - variant without caps looks better. It may be related that it is harder to read or just looks too "catchy". Moreover, I asked @rf@mastodonsocial.ru community what they think of that and 82% of 22 people agreed on this change. This commit removes all usage of text-transform: uppercase, where the font size specified, it changes the value by one pixel larger, so we still keeping the "designed" size of the labels but without using CAPS.	5 years ago
Sasha Sorokin	5dcca33c56	Correct margins for heading actions (#12797) ... This commit changes margins of the page heading header, actions in order to fix displaying with low screen size and long enough header. It is working by giving heading and action buttons margin from top and then negating it in parent element. Whenever flex item wrap, the "negated" margin will be applied again, providing us nice space between header and action buttons. This commit also adds a margin to header, so it does not clamp with the heading actions and they wrap a little earlier (15px ahead). As well as the left margin is not anymore applied to the first action.	5 years ago
Sasha Sorokin	36426ed4ad	Use heading actions and placeholders in settings (#12801) ... This commit: - Refactors centered text blocks currently used for placeholders for empty tables and puts styles for it in separate class - .centered-text, simply aliasing text-align: center. Which is furtherly used in this commit. - Improves applications settings page to use heading actions, moving "New application" button there, and displaying placeholder "You have no applications" in place of empty table. - Improves custom emoji settings page to use heading action for "Upload" button, making it more easily accessible without need to scroll through all of the emojis. - Improves email domain blocks settings page, moving "Add new" to the heading actions and using placeholder "No e-mail domains currently blacklisted" instead of showing empty table.	5 years ago
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	5 years ago
Takeshi Umeda	0e8c0287d0	Fix shortNumberFormat to within 3 chars without units (#12706)	6 years ago
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	6 years ago
ThibG	dc0750abc3	Fix manual scrolling issue on Firefox/Windows (#12648) ... Fixes #12607 `will-change: transform` apparently makes manual scrolling impossible on Firefox/Windows. While this should probably be considered a Firefox bug, `will-change: transform` seem like a very aggressive performance hint that may possibly make the browser consume more resources than needed, especially in multiple-column mode. This was originally added to improve scrolling performances on mobile, but I think this isn't necessary anymore, because of the two following reasons: - `contain: paint` (which is implied by `contain: strict`, which we apply whenever the browser supports grids) should have similar effects - in single-column mode, the scrolling container is the root element, which I believe is optimized in at least Chromium Keep in mind that I have not been able to make in-depth benchmarks, and especially not been able to try on mobile, so performances should probably be investigated further…	6 years ago
Sasha Sorokin	34aa5c7cb2	Improve report page structure (#12615) ... * Move resolved button to the heading This is one of the commits on improving overall reports page structure. It changes where resolved button is located, moving it to the heading, right next to the "Report #n" header, so-called "hot-place" to look at. To accomplish this we have to declare one more content variable, change admin dashboard template to respect it and CSS files for minor styling, so buttons are inlined and centrally aligned according to the heading. * Move actions buttons below the report table I believe that actions to react on report should not be located at the top of the page, instead they should be either after the table or reporter's comment. This is just a logical sign that you should not react to the report without reading all the details first.	6 years ago
Thibaut Girka	abcba5c198	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	6 years ago
Hinaloe	eb551c480d	Highlight border when focusing poll-form footer (#12544)	6 years ago
ThibG	c05ed8a625	Fix poll options not being selectable via keyboard (#12538) ... * Fix poll options not being selectable via keyboard Fixes #12384 * Improve styling of poll option checkboxes/radio buttons * Use more appropriate ARIA roles for poll options * Allow switching between single and multiple choice from keyboard * Coding style * Avoid using .bind()	6 years ago
Thibaut Girka	99f1f48741	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	ed73376f1c	Fix conversations not having an unread indicator in web UI (#12506)	6 years ago
Thibaut Girka	2b7158427f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Sasha Sorokin	b532ead798	Fix counter sizing (#12446) ... 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.	6 years ago
Thibaut Girka	c0f7e21685	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	42b3b019e0	Fix blur behind closed registration message (#12442) ... * Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425	6 years ago
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream ... 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	6 years ago
ThibG	dfea7368c9	Add bookmarks (#7107) ... * 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	6 years ago
Thibaut Girka	83774367d2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's	6 years ago
ThibG	7cdb8c10e9	Minor improvements to poll composing UI (#12319) ... - Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width	6 years ago
Thibaut Girka	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream ... 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	6 years ago
Nima Boscarino	9b36f62df6	Add download button to audio and video players (#12179) ... * Add download button for audio player * Add download button for video player * fix padding for download button in Audio component	6 years ago
ThibG	3a929dbedd	Replace fav icon animation with CSS (#12175) ... Fixes #12151	6 years ago
Hinaloe	547a5bac9d	don't show outline of full-screen video (#12176)	6 years ago
ThibG	aa884e0484	Fix batch actions being hidden from mobile view (#12183) ... 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.	6 years ago
Thibaut Girka	61631f4751	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	6 years ago
Eugen Rochko	6ebd74f4fa	Fix media editing modal changing dimensions when image loads (#12131)	6 years ago
Eugen Rochko	f665901e3c	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	6 years ago
Thibaut Girka	a84aedb7a7	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.	6 years ago
Eugen Rochko	c9b8ba50f8	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	6 years ago
Eugen Rochko	9184522cb4	Fix issues in RTL layout in web UI (#12060)	6 years ago
Eugen Rochko	f51f99c3c2	Fix media editing modal and profile directory in light theme (#12059) ... Also: - Fix embed modal in light theme - Fix confirmation modal in light theme	6 years ago
Cutls	733a3d20b0	Fix bad word breaking on conversations (#12039) ... * Fix bad word breaking * Fix style * Fix style	6 years ago
Eugen Rochko	cbaea097be	Add error description and button to copy stack trace to web UI (#12033)	6 years ago
Eugen Rochko	c35376132b	Fix long domain block descriptions breaking table layout (#12029)	6 years ago
Cutls	12c4ec0c83	Fix and remove ugly css around the conversation component (#12022)	6 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	6 years ago
ThibG	9027bfff0c	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	6 years ago
trwnh	d51201a75a	Fix muted text color not applying to all text (#11996) ... Pleroma generates polls without p tag	6 years ago
Eugen Rochko	bd9685f798	Fix public list of domain blocks being too verbose on about page (#11967)	6 years ago
ThibG	b0cda7a504	Fix vote checkmark in poll results (#11990)	6 years ago
Cutls	f31530b74d	Fix overflow on conversations (#11965) ... * Fix: overflow on conversations * Fix: overflow on conversations	6 years ago
ThibG	b359974d9b	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	6 years ago
Jeong Arm	26b810561a	Fix ugly TOC when title is too long (#11916) ... * Fix ugly TOC when title is too long * Fix TOC using grid, minmax	6 years ago
Eugen Rochko	bc5678d015	Change conversations UI (#11896) ... Fix #11414, fix #9860, fix #10434	6 years ago
Eugen Rochko	b9a8b38844	Fix page body not being scrollable in admin layout (#11893) ... Hide navigation behind hamburger icon on small screens in admin layout	6 years ago
Eugen Rochko	37ccafec8f	Fix left side of single column layout being cropped on smaller screens (#11894) ... Fix #11476	6 years ago
Eugen Rochko	b6df9c1067	Fix placeholder colors for inputs not being explicitly defined (#11890) ... Fix #11841	6 years ago
Eugen Rochko	d930eb88b6	Add table of contents to about page (#11885) ... Move public domain blocks information to about page	6 years ago
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	6 years ago
Eugen Rochko	e1066cd431	Add password challenge to 2FA settings, e-mail notifications (#11878) ... Fix #3961	6 years ago
ThibG	d41494226d	Fix poll options checkboxes/radio buttons not being vertically centered (#11833)	6 years ago
Eugen Rochko	cfd4c55c88	Fix profile fields overflowing page width (#11828) ... Fix #11720	6 years ago
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)	6 years ago
ThibG	cf2b708e6b	Fix display of long poll options (#11717)	6 years ago
Eugen Rochko	45f44ef4d3	Fix unused CSS (#11824) ... Fix #11689	6 years ago
Thibaut Girka	c7f71b974f	Fix flavour screenshot styling in vanilla flavour	6 years ago
Eugen Rochko	1110ea1a91	Add batch actions and categories to admin UI for custom emojis (#11793)	6 years ago
ThibG	ec2a439a22	Add account bio to account admin view (#11473) ... * Add account bio to account admin view * Change styling to make bio fields / content more readable	6 years ago
Eugen Rochko	261e52268c	Add batch approve/reject for pending hashtags in admin UI (#11791)	6 years ago
Thibaut Girka	5088eb8388	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	7db2c2e2ba	Fix line breaks in hashtag autosuggestions in web UI (#11764)	6 years ago
Eugen Rochko	43f56f1291	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	6 years ago
Eugen Rochko	34adc8784a	Fix uncached media in web UI not being clickable (#11745)	6 years ago
ThibG	0ea53122f2	Fix Mastodon logo style on hover on public pages' footer (#11735) ... Fixes #11690	6 years ago
ThibG	6493f4ffae	Fix height of dashboard counters (#11736)	6 years ago
Eugen Rochko	d344289431	Add "not available" label on unknown media attachments (#11715)	6 years ago
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.	6 years ago
Eugen Rochko	9871904172	Change layout of public profile directory to be the same as in web UI (#11705)	6 years ago
Eugen Rochko	cb447b28c4	Add profile directory to web UI (#11688) ... * Add profile directory to web UI * Add a line of bio to the directory	6 years ago
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.	6 years ago
Eugen Rochko	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	6 years ago
Eugen Rochko	4190e31626	Add audio player (#11644)	6 years ago
Eugen Rochko	73ca0bb925	Add option to include reported statuses in warning e-mail (#11639)	6 years ago
Eugen Rochko	4ef8d8b77c	Add header to trends section and change refresh rate to 15 minutes (#11641)	6 years ago
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	6 years ago