726 Commits (090d7c1807a39e5826fa5ee3cb60d422583232ee)

Author	SHA1	Message	Date
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