766 Commits (cf4fd8bcfe22c8ef8e6e2a86149dec3b39adc93c)

Author	SHA1	Message	Date
Thibaut Girka	4806232997	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	57643557b6	Avoid line breaks in poll options (#10188)	7 years ago
Eugen Rochko	d97cbb0da6	Add UI for creating polls (#10184) ... * Add actions and reducers for polls * Add poll button * Disable media upload if poll enabled * Add poll form * Make delete & redraft work with polls	7 years ago
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	7 years ago
Eugen Rochko	a198add83b	Fix various issues in polls (#10165) ... * Fix ActivityPub poll results being serialized even with hide_totals * Fix poll refresh button having a different font size * Display poll in OpenGraph description * Fix NoMethodError when serializing votes Regression from #10158 * Fix polls on public pages being broken for non-logged-in users * Do not show time remaining if poll has no expiration date	7 years ago
ThibG	4ced609497	Fixes to the polls UI (#10150) ... * Allow unselecting choices in multiple choice polls * Properly disable checkboxes/radio buttons for polls in public pages * Visually differentiate checkboxes and radio buttons	7 years ago
Eugen Rochko	230a012f00	Add polls (#10111) ... * Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media	7 years ago
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
trwnh	df01206703	Allow getting-started to scroll on short screens (#10075) ... At 480px height, there is not enough space to fully display the footer.	7 years ago
Thibaut Girka	369a475a70	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.	7 years ago
Eugen Rochko	80388a3ffe	Change error graphic to hover-to-play (#10055) ... Fix #6060	7 years ago
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Ben Lubar	309043b158	Improve image description user experience (#10036) ... * Add image descriptions to searchable post content. * Allow multi-line image descriptions. * Request image descriptions in the same query as posts when creating the search index. (see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)	7 years ago
ThibG	188f1c7c89	Add list title editing (#9748) ... * Add list title editing Port changes made by ash for glitch-soc * Code style fixes	7 years ago
Eugen Rochko	114cdc36aa	Fix style regressions on landing page (#10030)	7 years ago
Eugen Rochko	169b9d4428	Fix hashtags select styling in default and high contrast themes (#10029)	7 years ago
ThibG	98d1a1f117	Disable box shadows for featured hashtags in light theme (#10034) ... Fixes #9990	7 years ago
Eugen Rochko	c6e7b97baa	Fix color of static page links in high contrast theme (#10028)	7 years ago
Thibaut Girka	bf94a43496	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	7 years ago
trwnh	76d41475a8	[UI] Fix whitespace being applied to div instead of p (#9968) ... * fix large line breaks * fix ascii art posts	7 years ago
Eugen Rochko	364f2ff9aa	Add featured hashtags to profiles (#9755) ... * Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10	7 years ago
Thibaut Girka	e87bd6d94a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes	7 years ago
Eugen Rochko	ad8c71c985	Fix link color in high-contrast theme, add underlines (#9949) ... Improve sorting of default themes in the dropdown	7 years ago
Thibaut Girka	04e2c67389	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
trwnh	c87863bdd1	Fix Firefox scrollbar color regression in #9210 (#9908) ... In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.	7 years ago
Jeong Arm	d50e824168	Apply style for .landing-page strong (#9892)	7 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.	7 years ago
Eugen Rochko	b506ce1197	Fix new hashtag page's items not being full-width on mobile (#9852) ... Fix #9845	7 years ago
Eugen Rochko	a492a9bcd3	Add information about how to opt-in to the directory on the directory (#9834) ... Fix #9833	7 years ago
Mélanie Chauvel (ariasuni)	b8894c429a	Fix slightly cropped font on settings page dropdowns when using system font (#9839)	7 years ago
Eugen Rochko	8b19903559	Improve the public hashtag page (#9831) ... - Fix height not updating when clicking show more on public hashtag page - Add header to the public hashtag page - Change text size and margins on the public hashtag page	7 years ago
ThibG	3b3a4d8a17	Fix public hashtag timeline width on mobile, fix scrollbar width compensation (#9824) ... * Fix hashtag timeline width being potentially larger than window width * Add automatic computation of scrollbar width	7 years ago
Eugen Rochko	bc642ac24b	Redesign public hashtag page to use a masonry layout (#9822)	7 years ago
Thibaut Girka	dbe311f0e9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml	7 years ago
ThibG	c5b8824a3e	Fix hashtag timeline on mobile (#9806) ... Instead of forcing 90vh for the scrollable part of the timeline's height as in #9781 (which may be off), use `display: flex`, exactly like on desktop.	7 years ago
Thibaut Girka	eff1c94744	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Jeong Arm	9ee9cb549b	Adjust admin UI right panel size (#9768) ... * Adjust admin UI right panel size * Fix typo	7 years ago
Mateusz Bugowski	1183246043	change height on narrow view to take 100% of screen (#9781) ... * change height on narrow view to take 100% of screen * add empty line before @media	7 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	7 years ago
Thibaut Girka	3a0b12cbfe	Fix how flavour screenshots are displayed in the vanilla flavour	7 years ago
Eugen Rochko	1c6588accc	Redesign admin instances area (#9645)	7 years ago
Eugen Rochko	bd5a8c7765	Fix embed play icons regression from #9715 (#9731)	7 years ago
Eugen Rochko	92daf7cd37	Fix unreadable text color in report modal for some statuses (#9716) ... Fix #9697	7 years ago
Eugen Rochko	1512af2811	Display fallback link card thumbnail when none is given (#9715)	7 years ago
Thibaut Girka	1b35ca17a9	Fix some image paths in SCSS files	7 years ago
Thibaut Girka	eb481c9049	Fix syntax errors in win95 SCSS file	7 years ago
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	7 years ago
Eugen Rochko	6e49907ecf	Improve admin UI for account view (#9643)	7 years ago
Thibaut Girka	3e686beaea	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.	7 years ago
Eugen Rochko	3c033c4352	Add moderation warnings (#9519) ... * Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain	7 years ago