951 Commits

Author	SHA1	Message	Date
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	2018-02-02 08:39:52 -06:00
Charlotte Fields	af40824998	moved save button (#3792) ... * moved save button * added save back to the bottom * Update show.html.haml	2018-02-02 10:45:43 +01:00
Akihiko Odaki	5da5c65db8	Unify links container implementation in about pages (#6382) ... They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.	2018-02-02 10:32:21 +01:00
Alexander	04fef7b888	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	2018-02-02 10:18:55 +01:00
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	2018-01-28 22:45:17 -06:00
Eugen Rochko	79bc3d5845	Add direction tags to HTML e-mails for RTL languages (#6373)	2018-01-29 00:22:20 +01:00
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
ThibG	4ec9d8b4d9	Display deleted users' role as “Suspended” (#6339) ... Follow-up to 6eb60260b1 which missed a spot where the same error occurs.	2018-01-23 14:31:31 +01:00
Akihiko Odaki	8cc65cde27	Resolve URL for local account in follow authorization success view (#6324)	2018-01-22 14:22:14 +01:00
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	2018-01-21 13:36:10 -06:00
Eugen Rochko	1287de1b83	Fix invalid value passed to full_asset_url in mailers (#6312)	2018-01-21 13:20:00 +01:00
David Yip	2c578a01d8	Merge remote-tracking branch 'origin/master' into gs-master	2018-01-20 16:42:57 -06:00
Iijima Yasushi	72f9eab3d6	Change mailer avatar url (#6309) ... * Change mailer avatar url * Use full_asset_url method	2018-01-20 19:27:13 +01:00
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-20 10:45:43 -06:00
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	2018-01-20 01:32:21 +01:00
Eugen Rochko	01421999ae	Make text e-mails consistent with HTML ones in UserMailer (#6291) ... * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	2018-01-20 01:32:05 +01:00
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	2018-01-19 15:22:10 -06:00
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	2018-01-18 19:17:25 +01:00
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-17 16:17:10 +00:00
mayaeh	eed7484cd6	Change mailer image url (#6279) ... * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	2018-01-17 12:41:24 +01:00
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263) ... * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	2018-01-16 20:20:15 +01:00
Yamagishi Kazutoshi	9a28052e92	Change image URL in mailer to full path (#6264)	2018-01-16 06:26:46 +01:00
kibi!	cda845ae0e	Fix mailer to use webpack core	2018-01-15 21:17:03 -08:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	2018-01-16 03:29:11 +01:00
Jenkins	9fa79bc317	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-12 02:17:15 +00:00
Jeong Arm	704053d221	Handle sessions that can't be translated (#6245) ... * Handle sessions that can't be translated This commit fixes #6165. * Fix typo	2018-01-12 02:44:28 +01:00
David Yip	991371af5f	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb	2018-01-09 14:16:45 -06:00
Eugen Rochko	d41f0b66cc	Fix #6204: Use content warning for page title when present (#6231)	2018-01-09 19:34:58 +01:00
kibigo!	44792de49a	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	2018-01-08 10:57:52 +01:00
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-07 15:17:13 +00:00
SerCom_KC	c4d36d024c	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	2018-01-07 17:32:50 +09:00
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-05 22:17:12 +00:00
Quenty31	06636c6eca	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	2018-01-05 18:59:43 +09:00
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 20:17:13 +00:00
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	2018-01-03 18:08:57 +01:00
Marcin Mikołajczak	53d99ebf4f	i18n: Update Polish translation (#6168) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi	1001922156	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	2018-01-03 21:00:39 +09:00
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
Patrick Figel	04ecf44c2f	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	2018-01-02 16:55:00 +01:00
Otakan	ce854ed506	delete X-UA-Compatible (#6068) ... * delete X-UA-Compatible * undo * restore	2018-01-02 13:38:12 +01:00
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146) ... Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	2018-01-02 20:39:12 +09:00
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	2018-01-02 00:11:41 -06:00
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	2017-12-31 17:28:20 +09:00
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	2017-12-30 17:20:07 -06:00
beatrix	a56c4742d3	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	2017-12-30 02:43:43 +01:00
Eugen Rochko	38fc1b498d	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	2017-12-29 19:52:04 +01:00
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-24 15:17:12 +00:00
Nolan Lawson	a8eb0bf44f	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	2017-12-24 04:48:31 +01:00
Jenkins	6d00ca1c71	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-22 04:17:14 +00:00
ThibG	6eb60260b1	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.	2017-12-22 02:14:17 +01:00
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 18:17:16 +00:00
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	2017-12-13 13:28:31 +01:00
Eugen Rochko	20a6584d2d	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	2017-12-13 12:15:10 +01:00
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
Eugen Rochko	30d2ea03b0	Improve public status page title (#5985)	2017-12-12 03:56:30 +01:00
kibigo!	ed7231947c	Added styling	2017-12-10 20:32:28 -08:00
kibigo!	bdca1614d5	Screenshot support for themes	2017-12-10 20:32:28 -08:00
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
cwm	072ab191cc	pulled master, moved locale entry to new location	2017-12-10 15:22:15 -06:00
kibigo!	1c728df92e	Only localize js when there's a theme	2017-12-10 11:08:04 -08:00
kibigo!	b28cd6769c	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
kibigo!	d08d0f9f33	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	2017-12-09 10:26:22 -06:00
Yamagishi Kazutoshi	931e66e572	Back to Web UI from tag page when signed in (#5943)	2017-12-09 14:19:07 +01:00
Eugen Rochko	70ce2a2095	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)	2017-12-09 00:55:58 +01:00
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	2017-12-06 17:44:07 -05:00
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	2017-12-06 15:04:49 +09:00
kibigo!	5bed0f10ed	Various fixes	2017-12-04 21:58:10 -08:00
David Yip	a807e3b71b	current_theme -> current_flavour (#229)	2017-12-04 11:35:35 -06:00
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
kibigo!	1c74ede69e	Fixed a name + localizations	2017-12-04 00:19:39 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
Yamagishi Kazutoshi	eee3b32b77	Fix invites form path (#5861)	2017-12-01 12:26:57 +01:00
Yamagishi Kazutoshi	df03042a6e	Allow admin to deactivate invite created by users (#5860)	2017-12-01 12:26:19 +01:00
kibigo!	541fe9b110	Skins support	2017-11-30 19:29:47 -08:00
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-28 11:45:13 -06:00
Yamagishi Kazutoshi	15fab79cfa	Show "expired" in invite index (#5838) ... * Show "expired" in invite index * "Force expire" -> "Deactivate"	2017-11-28 15:41:02 +01:00
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	2017-11-27 22:33:26 -06:00
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832)	2017-11-27 22:47:06 +01:00
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-27 11:29:04 -06:00
Yamagishi Kazutoshi	1c5b0e3334	Use account.username when display_name is empty (#5828)	2017-11-27 16:09:52 +01:00
Eugen Rochko	740f8a95a9	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	2017-11-27 16:07:59 +01:00
Jenkins	5de42665d7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-27 05:17:11 +00:00
Alda Marteau-Hardi	0ea4478b68	Use account.display_name for og:title single toot pages (#5821)	2017-11-27 05:31:26 +01:00
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-24 01:17:20 +00:00
Eugen Rochko	e84fecb7e9	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	2017-11-24 02:05:53 +01:00
kibigo!	8812bab687	Minor fixes	2017-11-21 18:17:38 -08:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	2017-11-19 01:30:29 -06:00
Yamagishi Kazutoshi	bfdcf76a64	Add “staff” badge to admin user pages (#5735) ... * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	2017-11-19 04:13:57 +01:00
Eugen Rochko	58cede4808	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	2017-11-18 19:39:02 +01:00
Jenkins	94c5a11cda	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-17 20:17:12 +00:00
unarist	e28b33c89c	Move "Permissions" row into main table in /admin/accounts/:id (#5734)	2017-11-17 15:18:20 +01:00
kibigo!	585758a373	Themed prefetching	2017-11-16 21:37:08 -08:00
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
ysksn	9dd5e329ab	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728)	2017-11-17 01:22:38 +01:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	2017-11-16 01:21:16 -06:00
Eugen Rochko	fbef909c2a	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)	2017-11-14 21:12:57 +01:00
Anna e só	0e6c4cb796	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	2017-11-14 11:07:38 +09:00
Eugen Rochko	7bb8b0b2fc	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	2017-11-11 20:23:33 +01:00
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	2017-11-08 15:19:49 +01:00
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	2017-11-07 19:06:44 +01:00
nullkal	b6e2e999bd	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	2017-11-07 14:49:32 +01:00
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	2017-11-01 14:46:05 +01:00
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	2017-10-31 12:25:51 +01:00
SerCom_KC	29609fbb6a	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	2017-10-30 12:34:58 +09:00
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501)	2017-10-28 00:04:44 +09:00
David Yip	870d71b78b	Merge branch 'master' into gs-master	2017-10-27 09:45:25 -05:00
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	2017-10-27 16:11:30 +02:00
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	2017-10-25 17:37:48 -04:00
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	2017-10-25 16:01:20 -05:00
David Yip	9226257a1b	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.	2017-10-24 18:40:28 -05:00
Matthew Walsh	a76b024228	Changes to match other timelines in 2.0	2017-10-22 18:45:35 -07:00
David Yip	1a60445a5f	Address unused translation errors.	2017-10-22 01:05:56 -05:00
David Yip	cd04e3df58	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.	2017-10-21 14:54:36 -05:00
David Yip	2e03a10059	Spike out index and new views for keyword mutes controller.	2017-10-21 14:54:36 -05:00
David Yip	4fa2f7e82d	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.	2017-10-21 14:54:36 -05:00
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
Håkan Eriksson	a2b600428c	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	2017-10-17 13:41:36 +09:00
beatrix	7364b26e4b	Merge pull request #184 from tootsuite/master ... Fix reduced motion breaking public galleries (#5423)	2017-10-16 17:05:42 -04:00
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423)	2017-10-16 21:08:01 +02:00
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:23:59 -05:00
KY	f72936b4e6	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	2017-10-16 14:10:12 +02:00
Nolan Lawson	fa0be3f834	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	2017-10-16 09:36:15 +02:00
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-16 01:29:02 -05:00
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357)	2017-10-14 14:48:12 +02:00
KY	1bdd694a0a	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	2017-10-14 14:40:10 +02:00
Ondřej Hruška	bd51a16150	add duck beaks in haml	2017-10-11 21:34:00 +02:00
Ondřej Hruška	0bf9261e65	Merge remote-tracking branch 'upstream/master'	2017-10-11 21:27:17 +02:00
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
takayamaki	27101f1beb	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
Nolan Lawson	6a50329a9c	Only preload JS in /web pages (#5325)	2017-10-11 19:20:55 +02:00
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308)	2017-10-11 00:52:25 +02:00
Eugen Rochko	6e9e0c14e6	Fix dependency of error page generation on database (#5280)	2017-10-09 10:05:10 +02:00
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	2017-10-07 20:26:43 +02:00
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	2017-10-07 20:00:35 +02:00
kibigo!	6610d57f91	Basic static metadata styling	2017-10-06 22:22:34 -07:00
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	2017-10-05 23:42:05 +02:00
Eugen Rochko	b406e3cc4c	Fix #5050 - Use summary_large_image only with media attachments (#5219)	2017-10-04 19:06:23 +02:00
Lynx Kotoura	43577e9f59	Fix style of email domain block table (#5218)	2017-10-04 18:16:30 +02:00
utam0k	b3af3f9f8c	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	2017-10-04 15:16:10 +02:00
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	2017-10-04 10:22:52 +02:00
Jeong Arm	0db47196fb	Fix stupid typo (#5184)	2017-10-02 23:27:52 +02:00
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	2017-10-02 23:26:28 +02:00
Jeong Arm	d841af4e80	Append confirmation link as plain text (#5146) ... * Append confirmation link as plain text Some mail application is malfunctioning with links. * Change description text	2017-10-02 07:21:46 +02:00
Eugen Rochko	47ecd652d3	Make Chrome splash screen same color as web UI's background color (#5169)	2017-10-02 01:23:32 +02:00
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	2017-10-01 10:52:39 +02:00
Ondřej Hruška	ce3e0faf4d	add login form to landing page if regs are closed	2017-09-29 16:41:18 +02:00
kibigo!	53f829dfa8	HAML fix	2017-09-28 18:16:04 -07:00
Eugen Rochko	5b45c1646a	Remove dependency on db during assets:precompile (#5138)	2017-09-29 03:03:03 +02:00
kibigo!	cf1f83ca2a	Fixed lingering upstream Theme code	2017-09-28 17:45:16 -07:00
kibigo!	1522795853	new HAML for statuses	2017-09-28 17:18:12 -07:00
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
kibigo!	86e617a839	Better themeing support!!	2017-09-25 19:24:32 -07:00
Eugen Rochko	3b60832214	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	2017-09-25 23:05:54 +02:00
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	2017-09-25 04:04:04 +02:00
Eugen Rochko	2f079573ed	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	2017-09-24 05:58:30 +02:00
Eugen Rochko	1e02ba111a	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	2017-09-23 14:47:32 +02:00
Eugen Rochko	9c8e602163	Fix custom emojis not detected when used in content warning (#5049)	2017-09-23 01:50:17 +02:00
Eugen Rochko	846cd4e838	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	2017-09-23 01:41:00 +02:00
kibigo!	15c9c2fd7e	Pinned toots; embeds	2017-09-20 02:50:53 -07:00
Andrew	0401a24558	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	2017-09-19 16:36:23 +02:00
unarist	4aea3f88a6	Hide sensitive image in default on the public pages (#5009) ... Additionally, this restores previous background / text color for media spoiler.	2017-09-19 16:03:45 +02:00
Eugen Rochko	09a94b575e	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	2017-09-19 03:52:38 +02:00
Eugen Rochko	81cec35dbf	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	2017-09-19 02:42:40 +02:00
BruWalfas	c155d843f4	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	2017-09-19 07:47:48 +09:00
Yamagishi Kazutoshi	dcf1139ebd	Do not add image size without meta to OGP (regression from #4901) (#4995)	2017-09-18 15:00:29 +02:00
Yamagishi Kazutoshi	9e0985d9e4	Add strip_insignificant_zeros: true option to number_to_human (#4993)	2017-09-18 04:55:23 +02:00
Lynx Kotoura	4c14ff659b	Oauth code in input form and add description message (#4986) ... * Oauth code in a input form and add description * New authcode description	2017-09-17 15:23:44 +02:00
Mingye Wang	c8969dca35	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	2017-09-16 18:48:38 +02:00
Lynx Kotoura	1e3b1d7211	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	2017-09-16 18:39:11 +02:00
Eugen Rochko	2bbf987a0a	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	2017-09-14 03:39:10 +02:00
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	2017-09-14 00:04:30 +02:00
nullkal	da77f65c46	Add instance search feature (#4925)	2017-09-13 12:30:07 +02:00
nullkal	9e2ff3ef71	Make instance names in into links to user list in the instance (#4924)	2017-09-13 11:34:07 +02:00
unarist	af10c9fbff	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	2017-09-12 23:06:10 +02:00
Eugen Rochko	8f8e677630	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	2017-09-12 05:39:38 +02:00
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	2017-09-11 16:19:54 +02:00
Anna e só	c2bee07dbc	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	2017-09-11 08:40:29 +09:00
David Yip	932571fa22	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
Eugen Rochko	7d7844a47f	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)	2017-09-10 09:58:38 +02:00
David Yip	67ad453373	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	2017-09-09 23:56:21 -05:00
David Yip	514fc908a3	Merge tag 'v1.6.0rc3' into sync/upstream	2017-09-09 14:28:08 -05:00
David Yip	b9f7bc149b	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	2017-09-09 14:27:47 -05:00
Quent-in	bc077018b8	i10n minors changes for 1.6 (#4867) ... * wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes	2017-09-09 18:22:56 +02:00
Lynx Kotoura	3c45d3963a	Scrollable tables in settings pages (#4857) ... * Scrollable tables in settings pages * Add space before curly brace	2017-09-09 02:26:58 +02:00
Eugen Rochko	1caf11ddcc	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	2017-09-08 12:32:22 +02:00
Quent-in	b00cc4b9bd	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	2017-09-07 22:07:03 +02:00
Lynx Kotoura	4c3dd0b254	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	2017-09-05 12:31:24 +02:00
Eugen Rochko	09cffaaf04	Fix #4551 - Use correct syntax for content preloading (#4798)	2017-09-04 02:14:12 +02:00
Lynx Kotoura	cfe39fb58d	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	2017-09-02 15:49:28 +02:00
Yamagishi Kazutoshi	6fd2e8c3c5	Fix profile page when use system's font (#4774)	2017-09-02 14:01:59 +02:00
m4sk1n	0b32338e3f	Add link to 'noscript' message (#4561) ... * Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent	2017-09-02 01:52:28 +02:00
Yamagishi Kazutoshi	2305f7c391	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	2017-09-01 16:13:31 +02:00
Eugen Rochko	e95bdec7c5	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	2017-08-30 10:23:43 +02:00
Eugen Rochko	15093f9113	Shorten display of large numbers on public profiles (#4711)	2017-08-27 17:04:45 +02:00
Yamagishi Kazutoshi	3ac7b353f8	Fix missing at-sign (regression from #4688) (#4705)	2017-08-26 12:39:26 +02:00
Yamagishi Kazutoshi	00f9f16f94	Change timezone of the datetime to what browser specifies (#4688)	2017-08-25 17:21:00 +02:00
Yamagishi Kazutoshi	b88635202f	Add label for application scopes (#4691) ... * Add label for application scopes * hint	2017-08-25 13:03:26 +02:00
Eugen Rochko	9caa90025f	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	2017-08-25 01:41:18 +02:00
nullkal	80393a23d0	Use checkboxes for application scope setting (#4671)	2017-08-23 15:16:20 +02:00
Eugen Rochko	c1b086a538	Fix up the applications area (#4664) ... - Section it into "Development" area - Improve UI of application form, index, and details	2017-08-23 00:59:35 +02:00
Daigo 3 Dango	696c2c6f2f	Add Mastodon::Source.url (#4643) ... * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	2017-08-22 22:54:19 +02:00
Colin Mitchell	871c0d251a	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	2017-08-22 18:33:57 +02:00
nightpool	efec02f153	use existing inflections instead of custom helper (#4624) ... * use existing inflections instead of custom helper * use ActiveSupport versions	2017-08-17 23:20:50 +02:00
nullkal	075d6a1e13	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	2017-08-17 17:52:40 +02:00
Eugen Rochko	ca7ea1aba9	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	2017-08-16 17:12:58 +02:00
unarist	5b9ae7981e	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	2017-08-14 14:09:00 +02:00
Eugen Rochko	3c6503038e	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	2017-08-14 04:53:31 +02:00
Eugen Rochko	a2aeacbfee	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)	2017-08-13 00:45:04 +02:00
Lynx Kotoura	dcbc1af38a	Fix short description in about/more page (#4554)	2017-08-08 15:49:32 +02:00
TheInventrix	c9fd6f386c	unify short description styling (#4548) ... apply same style class to the About description on both the landing page and the about/more page	2017-08-08 01:50:15 +02:00
Ondřej Hruška	7a1ca8b0df	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
Lynx Kotoura	a3e53bd442	Adjust tags and accounts page (#4534) ... * Adjust tag and accounts page * Remove units from 0px paddings	2017-08-07 20:33:06 +02:00
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	2017-08-05 04:24:58 +02:00
kibigo!	8150689b48	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	2017-07-31 19:40:57 +02:00
unarist	155ba8fd3a	Make salutation of email localizable (#4454)	2017-07-31 00:18:44 +02:00
Gô Shoemake	b61e3daf98	Multiple frontend support (#110) ... * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	2017-07-30 19:28:21 +02:00
Yamagishi Kazutoshi	f91284d230	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.	2017-07-30 16:24:18 +02:00
Lynx Kotoura	ea33cdc30b	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	2017-07-30 12:56:04 +02:00
Lynx Kotoura	57a794d8eb	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	2017-07-29 14:20:31 +02:00
Eugen Rochko	8c0dd33ce4	Fix current session not being displayed in sessions list (#4424)	2017-07-28 15:30:06 +02:00
Ondřej Hruška	4115043dc7	Added external link icons to joinmastodon navbar buttons (#4368)	2017-07-26 02:00:36 +02:00
Ondřej Hruška	4c233b4f3a	Add .fa-external-link to instance list link	2017-07-25 23:30:13 +02:00
Ondřej Hruška	b7cf758fbe	Fix JS errors and add back commit hash	2017-07-25 21:54:12 +02:00
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
Yamagishi Kazutoshi	e5c0aa6493	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'	2017-07-25 15:59:43 +02:00
Eugen Rochko	1306d637a2	Fix oddities with public profile CSS (#4341) ... * Fix oddities with public profile CSS * Remove trailing whitespace	2017-07-24 17:56:50 +02:00
Eugen Rochko	029f2c4545	Redesign /terms page (#4338) ... * Redesign /terms page * Fix tests * Remove unused keys	2017-07-24 17:15:15 +02:00
Eugen Rochko	2374d63536	Redesign extended information page (#4322) ... * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS	2017-07-24 15:09:08 +02:00
sdukhovni	06d905f415	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	2017-07-24 14:26:55 +02:00
Yamagishi Kazutoshi	63a2566007	Fix manifest description (regression from #4122) (#4324)	2017-07-23 23:04:44 +02:00
Eugen Rochko	3a3b556065	Improve noscript message and style (#4315)	2017-07-23 20:28:06 +02:00
Yamagishi Kazutoshi	4d661e1183	Change logo.png to logo.svg for web UI (#4307)	2017-07-23 11:09:42 +02:00
Eugen Rochko	0e0f18ce7c	New logo (#4306) ... * Add new logo * Remove unused images	2017-07-23 02:40:39 +02:00
Ondřej Hruška	6913426e48	Merge pull request #92 from tootsuite/master ... tiny upstream merge	2017-07-22 22:20:17 +02:00
Eugen Rochko	311871eefc	Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299)	2017-07-22 16:36:54 +02:00
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	2017-07-22 01:16:53 +00:00