948 Commits (065a19b18bf129dac60ffec78615f4135aa2f987)

Author	SHA1	Message	Date
Alexander	23ce0c86da	pam authentication (#5303) ... * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	7 years ago
David Yip	87517e2dd8	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	6278ffdba3	Add direction tags to HTML e-mails for RTL languages (#6373)	7 years ago
Jenkins	3cd4a0804b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	42457924eb	Display deleted users' role as “Suspended” (#6339) ... Follow-up to 87ee458079 which missed a spot where the same error occurs.	7 years ago
Akihiko Odaki	a87bb3f4f6	Resolve URL for local account in follow authorization success view (#6324)	7 years ago
David Yip	a95ca95b7b	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
Eugen Rochko	d9421e01df	Fix invalid value passed to full_asset_url in mailers (#6312)	7 years ago
David Yip	d000f5dd80	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Iijima Yasushi	c8d971a5c1	Change mailer avatar url (#6309) ... * Change mailer avatar url * Use full_asset_url method	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	896cadceed	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
Eugen Rochko	5f9c017c01	Make text e-mails consistent with HTML ones in UserMailer (#6291) ... * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	7 years ago
David Yip	d45ebe26dc	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	b0f2bff481	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
Jenkins	8c41fb4acc	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mayaeh	ef20e5d3fd	Change mailer image url (#6279) ... * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	7 years ago
Eugen Rochko	000b0baac2	HTML e-mails for NotificationMailer (#6263) ... * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	7 years ago
Yamagishi Kazutoshi	d60d5fbd26	Change image URL in mailer to full path (#6264)	7 years ago
kibi!	be525dd4db	Fix mailer to use webpack core	7 years ago
David Yip	de7283a318	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	9613c3238c	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
Jenkins	e6049e6fd0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Jeong Arm	73b6f2ebe9	Handle sessions that can't be translated (#6245) ... * Handle sessions that can't be translated This commit fixes #6165. * Fix typo	7 years ago
David Yip	1a7f8eb723	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb	7 years ago
Eugen Rochko	6d9f2924ad	Fix #6204: Use content warning for page title when present (#6231)	7 years ago
kibigo!	134e6590c6	Don't show skins selector when there's only one (#256)	7 years ago
Jenkins	1f469edac1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	c8f0be1d6d	Revert #5772 (#6221)	7 years ago
Jenkins	8704a190c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
SerCom_KC	154bd8db56	Update Simplified Chinese translations (#6215) ... * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations	7 years ago
Jenkins	86007e913d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Quenty31	cf9323449e	l10n Occitan language: mailer update (#6193) ... * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb	7 years ago
Jenkins	a7b8cb9493	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	7a0479c830	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	7 years ago
Marcin Mikołajczak	b83fb8b107	i18n: Update Polish translation (#6168) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Yamagishi Kazutoshi	d50d61a90c	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) ... * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132	7 years ago
Jenkins	b42e6973a1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Patrick Figel	3c20cfd734	Add confirmation step for email changes (#6071) ... * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	7 years ago
Otakan	1cd5812c6b	delete X-UA-Compatible (#6068) ... * delete X-UA-Compatible * undo * restore	7 years ago
Branko Kokanovic	1c4142da5b	Adding Serbian latin translations (#6146) ... Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	7 years ago
David Yip	ed572490c1	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	616b6867a0	Show mastodon on modal (#6129)	7 years ago
Jenkins	5975446002	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Branko Kokanovic	34a90dc266	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	7 years ago
David Yip	01f91695f5	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
beatrix	d9c2806048	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
Eugen Rochko	9427823d5c	Add more instance stats APIs (#6125) ... * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	7 years ago
Jenkins	503e7fb4d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Nolan Lawson	59a50e6489	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	7 years ago
Jenkins	9ccad78647	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	87ee458079	Display deleted users' role as “Suspended” (#6080) ... Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead.	7 years ago
Jenkins	1366e96a02	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	d6088c5308	Add filters to admin UI for custom emojis (#6003)	7 years ago
Eugen Rochko	aea3d0814b	Clean up admin UI for accounts (#6004) ... * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data	7 years ago
David Yip	a56c9ac5dc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
Eugen Rochko	d5f4baf720	Improve public status page title (#5985)	7 years ago
kibigo!	d9e1496990	Added styling	7 years ago
kibigo!	a1c79ef544	Screenshot support for themes	7 years ago
kibigo!	901c08a999	Moved flavour UI into own prefs tab	7 years ago
cwm	34630e00cb	pulled master, moved locale entry to new location	7 years ago
kibigo!	853082e760	Only localize js when there's a theme	7 years ago
kibigo!	99e8710095	Javascript intl8n flavour support	7 years ago
kibigo!	f4c233f59f	Ruby intl8n for themes	7 years ago
cwm	41bbfeec7c	add initial components based off of tootsuite pr #1507	7 years ago
Yamagishi Kazutoshi	03d28b6ec8	Back to Web UI from tag page when signed in (#5943)	7 years ago
Eugen Rochko	b95863ec48	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)	7 years ago
beatrix	f0b37f92a9	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	7 years ago
Jenkins	a3a7b6a848	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	b037fbf9f4	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	7 years ago
kibigo!	fd7be49523	Various fixes	7 years ago
David Yip	0002d12c24	current_theme -> current_flavour (#229)	7 years ago
David Yip	1221e3075d	Merge branch 'gs-master' into glitch-theme	7 years ago
kibigo!	935946020f	Fixed a name + localizations	7 years ago
kibigo!	882055afd0	Rename themes -> flavours ? ?	7 years ago
Jenkins	822dea26c3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	1447ef1d44	Add invite filter (#5862)	7 years ago
Yamagishi Kazutoshi	7f0a01a20c	Fix invites form path (#5861)	7 years ago
Yamagishi Kazutoshi	53145abfbf	Allow admin to deactivate invite created by users (#5860)	7 years ago
kibigo!	36b9f4df56	Skins support	7 years ago
David Yip	a1d9c68198	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Yamagishi Kazutoshi	d6846dce20	Show "expired" in invite index (#5838) ... * Show "expired" in invite index * "Force expire" -> "Deactivate"	7 years ago
David Yip	bc10a0dced	Merge remote-tracking branch 'tootsuite/master'	7 years ago
Eugen Rochko	55d9abcceb	Add UI for setting up account migration (#5832)	7 years ago
David Yip	c9dd67a733	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Yamagishi Kazutoshi	d5e4cb2ca1	Use account.username when display_name is empty (#5828)	7 years ago
Eugen Rochko	bc8c951083	Add consumable invites (#5814) ... * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	7 years ago
Jenkins	f504ac4ff6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Alda Marteau-Hardi	191993c811	Use account.display_name for og:title single toot pages (#5821)	7 years ago
Jenkins	359ba16721	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	efc97d404c	Add logging of admin actions (#5757) ... * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	7 years ago
kibigo!	eadf1c38a5	Minor fixes	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
David Yip	1dc24ece41	Merge remote-tracking branch 'tootsuite/master'	7 years ago
Yamagishi Kazutoshi	bffc1b880b	Add “staff” badge to admin user pages (#5735) ... * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	7 years ago
Eugen Rochko	b89f614bd7	Profile redirect notes (#5746) ... * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	7 years ago
Jenkins	065e2388ba	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
unarist	5982d570de	Move "Permissions" row into main table in /admin/accounts/:id (#5734)	7 years ago
kibigo!	5845057adb	Themed prefetching	7 years ago
David Yip	5f689cdf78	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
ysksn	08cb63c360	Remove empty strings (#5732)	7 years ago
Eugen Rochko	21d01d5809	Display moderator badge (green), admin badge changed to red (#5728)	7 years ago
Surinna Curtis	02ae609d9a	Merge tootsuite/master at ab48f2b239	7 years ago
Eugen Rochko	80873c1134	Add option to block direct messages from people you don't follow (#5669) ... * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	7 years ago
Anna e só	c4c9003f84	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated	7 years ago
Eugen Rochko	97178b6d86	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	7 years ago
Quenty31	a7db7bdd96	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
Eugen Rochko	7f1a0241c1	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	7 years ago
nullkal	19f82492ab	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	7 years ago
MitarashiDango	3068add21d	add account search condition (instance domain) (#5577)	7 years ago
Nolan Lawson	ba22580c06	Add ServiceWorker caching for static assets (#5524)	7 years ago
SerCom_KC	282f0d7479	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	7 years ago
Nolan Lawson	2085c1fa33	Refactor initial state: reduce_motion and auto_play_gif (#5501)	7 years ago
David Yip	2aec3c073b	Merge branch 'master' into gs-master	7 years ago
nullkal	0a9cc96cdc	Feature: Unlisted custom emojis (#5485)	7 years ago
beatrix	ce738197b9	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	7 years ago
David Yip	eef50289c6	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	7 years ago
David Yip	7caca589c1	Override Action View name inference in settings/keyword_mutes. ... Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in templates this turns into e.g. settings/glitch/keyword_mutes. Going along with this convention means a lot of file movement, though, and for a UI that's as temporary and awkward as this one I think it's less effort to slap a bunch of as: options everywhere. We'll do the Right Thing when we build out the API and frontend UI.	7 years ago
Matthew Walsh	897931099c	Changes to match other timelines in 2.0	7 years ago
David Yip	4ab1534f6c	Address unused translation errors.	7 years ago
David Yip	e3f5ec2652	Fill in create, edit, update, and destroy for keyword mutes interface. ... Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	7 years ago
David Yip	018657a0e0	Spike out index and new views for keyword mutes controller.	7 years ago
David Yip	ebfec40698	Set up /settings/keyword_mutes. #164. ... This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	7 years ago
David Yip	dd4f9f18cb	Merge tag 'v2.0.0' into gs-master	7 years ago
Håkan Eriksson	c06052b7cf	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	7 years ago
beatrix	cda8575ae3	Merge pull request #184 from tootsuite/master ... Fix reduced motion breaking public galleries (#5423)	7 years ago
Nolan Lawson	d7b8208a37	Fix reduced motion breaking public galleries (#5423)	7 years ago
David Yip	e19bc7835a	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
KY	e1357265ed	Fix #5082 - disable retweet link for followers only toot (#5397) ... * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	7 years ago
Nolan Lawson	a54c272a1f	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	7 years ago
David Yip	ec18363c3b	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Lynx Kotoura	9aacf21af7	Adjust public hashtag pages (#5357)	7 years ago
KY	d4b9f821ca	Fix #5351 - Redirection with page params after copy emoji (#5387) ... * Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link	7 years ago
Ondřej Hruška	0f542d56b8	add duck beaks in haml	7 years ago
Ondřej Hruška	132a22ace5	Merge remote-tracking branch 'upstream/master'	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
takayamaki	4ee024e296	fix presented og:url is incorrect (#5320)	7 years ago
Nolan Lawson	3b6e5360c3	Only preload JS in /web pages (#5325)	7 years ago
takayamaki	cfab4a7ce4	sign_in and sign_up views present og meta infos (#5308)	7 years ago
Eugen Rochko	5a0e862664	Fix dependency of error page generation on database (#5280)	7 years ago
nullkal	81489970fb	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	b98cd0041b	Redesign public hashtag pages (#5237)	7 years ago
kibigo!	fb05013855	Basic static metadata styling	7 years ago
Eugen Rochko	b4af50c521	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Eugen Rochko	06aff382bc	Fix #5050 - Use summary_large_image only with media attachments (#5219)	7 years ago
Lynx Kotoura	f0aa03095d	Fix style of email domain block table (#5218)	7 years ago
utam0k	51f8cbfbeb	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	6bd4e3bf97	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago
Jeong Arm	985832e241	Fix stupid typo (#5184)	7 years ago
Jeong Arm	ee21576c19	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
Jeong Arm	0ddea5765c	Append confirmation link as plain text (#5146) ... * Append confirmation link as plain text Some mail application is malfunctioning with links. * Change description text	7 years ago
Eugen Rochko	0783f18274	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
Eugen Rochko	06ef1b0ac4	Reorganize preferences page (#5161)	7 years ago
Ondřej Hruška	18988b89cf	add login form to landing page if regs are closed	7 years ago
kibigo!	9bee4d313a	HAML fix	7 years ago
Eugen Rochko	20ff1c629d	Remove dependency on db during assets:precompile (#5138)	7 years ago
kibigo!	62fbd4d247	Fixed lingering upstream Theme code	7 years ago
kibigo!	9feca5cabf	new HAML for statuses	7 years ago
Ondřej Hruška	282a126b3f	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	0cc795db6b	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	7 years ago
Ondřej Hruška	914c0465b1	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
kibigo!	aac16a82d6	Better themeing support!!	7 years ago
Eugen Rochko	1767f9817c	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Eugen Rochko	6b0ea1e79c	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	9ad1bfbc18	In detail status view, display attachment uncropped if there's only one (#5054) ... * In detail status view, display attachment uncropped if there's only one * Make media spoiler the size of the media it hides, enable on static	7 years ago
Eugen Rochko	da257754b5	Add emoji autosuggest (#5053) ... * Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once	7 years ago
Eugen Rochko	d2aeb45461	Fix custom emojis not detected when used in content warning (#5049)	7 years ago
Eugen Rochko	16a5d1450c	Switch from EmojiOne to Twemoji, different emoji picker (#5046) ... * Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations	7 years ago
kibigo!	41832d083e	Pinned toots; embeds	7 years ago
Andrew	b4842ef0b9	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	7 years ago
unarist	57c5493d4e	Hide sensitive image in default on the public pages (#5009) ... Additionally, this restores previous background / text color for media spoiler.	7 years ago
Eugen Rochko	e9bb7e62b1	Admin interface for listing, adding and removing custom emojis (#5002) ... * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	7 years ago
Eugen Rochko	eb345f8e8b	Custom emoji (#4988) ... * Custom emoji - In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />` - In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }` - In REST API: Status object includes `emojis` array (`shortcode`, `url`) - Domain blocks with reject media stop emojis - Emoji file up to 50KB - Web UI handles custom emojis - Static pages render custom emojis as `<img />` tags Side effects: - Undo #4500 optimization, as I needed to modify it to restore shortcode handling in emojify() - Formatter#plaintext should now make sure stripped out line-breaks and paragraphs are replaced with newlines * Fix emoji at the start not being converted	7 years ago
BruWalfas	f4d0774877	A few updates to the Spanish translation and some typos fixing (#4997) ... * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	7 years ago
Yamagishi Kazutoshi	a3d75ce672	Do not add image size without meta to OGP (regression from #4901) (#4995)	7 years ago
Yamagishi Kazutoshi	313d90b8f4	Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)	7 years ago
Lynx Kotoura	8585421eb1	Oauth code in input form and add description message (#4986) ... * Oauth code in a input form and add description * New authcode description	7 years ago
Mingye Wang	9b85c3a13f	Minor Chinese check & jsx addition (#4973) ... * zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	7 years ago
Lynx Kotoura	b5ec3346fa	Adjust landing pages 2 (#4967) ... * Adjust landing pages 2 Fix styles of terms page Remove action buttons from timeline in about page Adjust styles of short description Adjust form inputs Set autocomplete off for username and email box in registration form. Remove line breakings. * Revert removing action buttons	7 years ago
Eugen Rochko	fbec33df62	Redesign video player (#4911) ... * Redesign video player * Use new video player on static public pages too * Use media gallery component on static public pages too * Pause video when hiding it * Full-screen sizing on WebKit * Add aria labels to video player buttons * Display link card on public status page * Fix fullscreen from modal sizing issue * Remove contain: strict property to fix fullscreen from columns	7 years ago
Eugen Rochko	9ff429aa6d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	7 years ago
nullkal	7f432a97a0	Add instance search feature (#4925)	7 years ago
nullkal	405b24ca30	Make instance names in into links to user list in the instance (#4924)	7 years ago
unarist	94fdf7da70	Add section for protocol specific information on the admin page (#4910) ... This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub	7 years ago
Eugen Rochko	d4fd2a39e6	Clean up and improve generated OpenGraph tags (#4901) ... - Return all images as og:image - Return videos as og:image (preview) and og:video - Return profile:username on profiles	7 years ago
unarist	b25c112d31	Reset preview image if avatar/header image selection was cancelled (#4893)	7 years ago
Anna e só	d639474d8c	l10n: Full PT-BR translation (#4882) ... * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	7 years ago
David Yip	f90abccf33	Merge tag 'v1.6.0' into sync/upstream	7 years ago
Eugen Rochko	6628ea4a82	Default follows for new users (#4871) ... When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)	7 years ago
David Yip	017738c604	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	7 years ago
David Yip	67d9178007	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
David Yip	da3f22ee7d	Merge branch 'origin/master' into sync/upstream ... Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	7 years ago
Quent-in	899e7ad811	i10n minors changes for 1.6 (#4867) ... * wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes	7 years ago
Lynx Kotoura	c268118e5b	Scrollable tables in settings pages (#4857) ... * Scrollable tables in settings pages * Add space before curly brace	7 years ago
Eugen Rochko	a27821f725	Fix language filter codes (#4841) ... * Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name	7 years ago
Quent-in	cbe9eb3f2e	i10n OC / FR update Pinned toots (#4842) ... * Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb	7 years ago
Lynx Kotoura	5a27eaae7c	Adjust status embeds (#4808) ... * Adjust status embeds Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal. * Remove trailing whitespace * Using width from the variable	7 years ago
Eugen Rochko	ce3a71690b	Fix #4551 - Use correct syntax for content preloading (#4798)	7 years ago
Lynx Kotoura	f13b1b67f5	Adjust settings pages (#4765) ... * views: Adjust heading positions * Adjust settings pages Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast. * Remove trailing whitespace	7 years ago
Yamagishi Kazutoshi	690e59b1f0	Fix profile page when use system's font (#4774)	7 years ago
m4sk1n	186416830e	Add link to 'noscript' message (#4561) ... * Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent	7 years ago
Yamagishi Kazutoshi	8d4e705cb0	Use system's default font on non web UI pages (#4553) ... * Use system's default font on non web UI pages * Remove import for Redirect	7 years ago
Eugen Rochko	651c659fd6	Update status embeds (#4742) ... - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	7 years ago
Eugen Rochko	007d26852d	Shorten display of large numbers on public profiles (#4711)	7 years ago
Yamagishi Kazutoshi	dc19078b59	Fix missing at-sign (regression from #4688) (#4705)	7 years ago
Yamagishi Kazutoshi	5e3c6f63be	Change timezone of the datetime to what browser specifies (#4688)	7 years ago
Yamagishi Kazutoshi	5482e0d10e	Add label for application scopes (#4691) ... * Add label for application scopes * hint	7 years ago
Eugen Rochko	3e20cb7025	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	7 years ago
nullkal	da85aff49c	Use checkboxes for application scope setting (#4671)	7 years ago
Eugen Rochko	b13501268f	Fix up the applications area (#4664) ... - Section it into "Development" area - Improve UI of application form, index, and details	7 years ago
Daigo 3 Dango	fd9d66dfd4	Add Mastodon::Source.url (#4643) ... * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	7 years ago
Colin Mitchell	63b98318c5	Application prefs section (#2758) ... * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	7 years ago
nightpool	6cce0bb080	use existing inflections instead of custom helper (#4624) ... * use existing inflections instead of custom helper * use ActiveSupport versions	7 years ago
nullkal	a90b5796a1	Show what protocol is used for accounts in admin/accounts#index (#4622) ... * Show what protocol used for in admin/accounts#index * Add frozen_string_literal	7 years ago
Eugen Rochko	2dba0368f8	Redesign public profiles (#4608) ... * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	7 years ago
unarist	40ec0f45fb	Update /admin/accounts/:id view for ActivityPub (#4600) ... * Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active	7 years ago
Eugen Rochko	0e5c8372e7	Add protocol handler. Handle follow intents (#4511) ... * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	7 years ago
Eugen Rochko	34962d9f9d	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)	7 years ago
Lynx Kotoura	cbcac23679	Fix short description in about/more page (#4554)	7 years ago
TheInventrix	f4017cce3f	unify short description styling (#4548) ... apply same style class to the About description on both the landing page and the about/more page	7 years ago
Ondřej Hruška	913dd13575	Merge remote-tracking branch 'upstream/master'	7 years ago
Lynx Kotoura	bac2a77deb	Adjust tags and accounts page (#4534) ... * Adjust tag and accounts page * Remove units from 0px paddings	7 years ago
Eugen Rochko	fd69694749	Add "signed in as" header to some pages (#4523)	7 years ago
kibigo!	2cdee6ae8a	Merge upstream (#111)	7 years ago
Masoud Abkenar	755a7f2646	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	7 years ago
unarist	15a8d9b0ca	Make salutation of email localizable (#4454)	7 years ago
Gô Shoemake	58446d39d8	Multiple frontend support (#110) ... * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	7 years ago
Yamagishi Kazutoshi	5d364da590	Do not create empty a element when there is no e-mail (#4455) ... Empty a element is created when there is no business e-mail input.	7 years ago
Lynx Kotoura	71bea1cd76	Set contact address in about/more as mailto link (#4450) ... * Set contact address as mailto link To be able to copy long email address * Set style for mailto link	7 years ago
Lynx Kotoura	b7482e4a9f	Fix autocomplete option in haml files (#4438) ... * Fix autocomplete in two_factor.html.haml * Fix autocomplete in registrations edit.html.haml * Fix autocomplete in passwords edit.html.haml * Fix autocomplete in _registration.html.haml * Fix autocomplete in new.html.haml * Fix autocomplete in show.html.haml * Add autocomplete option to sessions new.html.haml * Add autocomplete option to 2FA new.html.haml * Add autocomplete option to 2FA show.html.haml	7 years ago
Eugen Rochko	043dfdb474	Fix current session not being displayed in sessions list (#4424)	7 years ago
Ondřej Hruška	74e54cd45b	Added external link icons to joinmastodon navbar buttons (#4368)	7 years ago
Ondřej Hruška	affd86c1dc	Add .fa-external-link to instance list link	7 years ago
Ondřej Hruška	2129485669	Fix JS errors and add back commit hash	7 years ago
Ondřej Hruška	7072288bcf	Merge git://github.com/tootsuite/mastodon into tootsuite-master	7 years ago
Yamagishi Kazutoshi	9510179cc1	Send short account URL to remote instance (regression from #3844) (#4355) ... * Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json'	7 years ago
Eugen Rochko	0d0b225136	Fix oddities with public profile CSS (#4341) ... * Fix oddities with public profile CSS * Remove trailing whitespace	7 years ago
Eugen Rochko	fae1d9052b	Redesign /terms page (#4338) ... * Redesign /terms page * Fix tests * Remove unused keys	7 years ago
Eugen Rochko	e43e0e959c	Redesign extended information page (#4322) ... * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS	7 years ago
sdukhovni	961f103c35	Allow domain blocks that only reject media without silencing or suspending (#4325) ... * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs	7 years ago
Yamagishi Kazutoshi	99dfbbf623	Fix manifest description (regression from #4122) (#4324)	7 years ago
Eugen Rochko	cdaf19daeb	Improve noscript message and style (#4315)	7 years ago
Yamagishi Kazutoshi	2e766841f3	Change logo.png to logo.svg for web UI (#4307)	7 years ago
Eugen Rochko	78c7c9fb0f	New logo (#4306) ... * Add new logo * Remove unused images	7 years ago
Ondřej Hruška	1dda0acdcb	Merge pull request #92 from tootsuite/master ... tiny upstream merge	7 years ago
Eugen Rochko	6ab3893157	Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299)	7 years ago
beatrix-bitrot	8deb2072ef	Merge that good fresh upstream shit	7 years ago
Eugen Rochko	c35ea3636c	Fix #3220 - Show avatar/header on edit profile page (#4288)	7 years ago
Eugen Rochko	9d8d1d90e0	Add button to re-subscribe to all accounts from a domain (#4285)	7 years ago
beatrix	64a107bc64	Merge pull request #87 from tootsuite/master ... merge upstream	7 years ago