733 Commits

Author	SHA1	Message	Date
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 108c460531. * 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