62 Commits (1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05)

Author	SHA1	Message	Date
Thibaut Girka	1b0ff4cd69	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb	6 years ago
Eugen Rochko	20dda5cca0	Change full logo to use primary text color of the given theme (#10994) ... * Change full logo to use primary text color of the given theme * Fix colors of public layout header in light theme	6 years ago
Thibaut Girka	3d73d76e55	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	8d5dcc9301	Use `<use />` to render transparent SVG logo instead of inserting it (#10845)	6 years ago
Thibaut Girka	1d6152f440	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	6 years ago
Eugen Rochko	9c4cbdbafb	Add Keybase integration (#10297) ... * create account_identity_proofs table * add endpoint for keybase to check local proofs * add async task to update validity and liveness of proofs from keybase * first pass keybase proof CRUD * second pass keybase proof creation * clean up proof list and add badges * add avatar url to keybase api * Always highlight the “Identity Proofs” navigation item when interacting with proofs. * Update translations. * Add profile URL. * Reorder proofs. * Add proofs to bio. * Update settings/identity_proofs front-end. * Use `link_to`. * Only encode query params if they exist. URLs without params had a trailing `?`. * Only show live proofs. * change valid to active in proof list and update liveness before displaying * minor fixes * add keybase config at well-known path * extremely naive feature flagging off the identity proof UI * fixes for rubocop * make identity proofs page resilient to potential keybase issues * normalize i18n * tweaks for brakeman * remove two unused translations * cleanup and add more localizations * make keybase_contacts an admin setting * fix ExternalProofService my_domain * use Addressable::URI in identity proofs * use active model serializer for keybase proof config * more cleanup of keybase proof config * rename proof is_valid and is_live to proof_valid and proof_live * cleanup * assorted tweaks for more robust communication with keybase * Clean up * Small fixes * Display verified identity identically to verified links * Clean up unused CSS * Add caching for Keybase avatar URLs * Remove keybase_contacts setting	6 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	6 years ago
ThibG	f04f3ee436	Fix icon alignment in onboarding interaction screen (#9686)	6 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.	6 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	6 years ago
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	6 years ago
Eugen Rochko	9cb26bb56b	Add new first-time tutorial (#9531) ... * Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraph	6 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Maciek Baron	ca2cc556f1	Crush PNGs to reduce overall size (#7954)	7 years ago
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	90f12f2e5a	Focal points (#6520) ... * Add focus param to media API, center thumbnails on focus point * Add UI for setting a focal point * Improve focal point icon on upload item * Use focal point in upload preview * Add focalPoint property to ActivityPub * Don't show focal point button for non-image attachments	7 years ago
Eugen Rochko	61ed133fea	Account archive download (#6460) ... * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	7 years ago
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	2fc2725076	Fix e-mail icon for reblog being stretched (#6336)	7 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303) ... * Restore onboarding modal Revert 5ba8b3a396 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	7 years ago
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286) ... * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	7 years ago
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream ... Merge in home feed regeneration changes from upstream	7 years ago
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273) ... * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update ... Conflicts: app/javascript/styles/win95.scss config/themes.yml	7 years ago
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	7badad7797	Fix home regeneration (#6251) ... * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	7 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272)	7 years ago
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263) ... * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	7 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
Andrew	56312df73b	Z indexes and colors	7 years ago
Andrew	7a93acd803	To 2.1.2	7 years ago
Andrew	077f2e600c	Win95 to 2.1	7 years ago
Andrew	ed574fbc09	Theme: Windows 95	7 years ago
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	7 years ago
David Yip	e4944d065b	Switch to tootsuite's elephant friend for the drawer ... This version has a transparent background, which works better with the wave.	7 years ago
David Yip	7174d1c955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	65f30f65a2	Move the mastodon on Getting Started column to drawer column (#6109) ... Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space.	7 years ago
kibigo!	bdca1614d5	Screenshot support for themes	7 years ago
kibigo!	321fa41930	Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme	7 years ago
Andrew	2827f852c0	Theme: Windows 95	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	0d1215e82f	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	8 years ago
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	8 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	8 years ago