726 Commits (1ee0e91fb61849bf2e36f7adb1c91e0539d010e1)

Author	SHA1	Message	Date
Jenkins	9fa79bc317	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Jeong Arm	704053d221	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	991371af5f	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb	7 years ago
Eugen Rochko	d41f0b66cc	Fix #6204: Use content warning for page title when present (#6231)	7 years ago
kibigo!	44792de49a	Don't show skins selector when there's only one (#256)	7 years ago
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	7 years ago
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
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	7 years ago
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
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	7 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
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	7 years ago
Marcin Mikołajczak	53d99ebf4f	i18n: Update Polish translation (#6168) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
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	7 years ago
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
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	7 years ago
Otakan	ce854ed506	delete X-UA-Compatible (#6068) ... * delete X-UA-Compatible * undo * restore	7 years ago
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.	7 years ago
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	7 years ago
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	7 years ago
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
beatrix	a56c4742d3	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
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	7 years ago
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Nolan Lawson	a8eb0bf44f	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	7 years ago
Jenkins	6d00ca1c71	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
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.	7 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	7 years ago
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	7 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
Eugen Rochko	30d2ea03b0	Improve public status page title (#5985)	7 years ago
kibigo!	ed7231947c	Added styling	7 years ago
kibigo!	bdca1614d5	Screenshot support for themes	7 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	7 years ago
cwm	072ab191cc	pulled master, moved locale entry to new location	7 years ago
kibigo!	1c728df92e	Only localize js when there's a theme	7 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	7 years ago
kibigo!	d08d0f9f33	Ruby intl8n for themes	7 years ago
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	7 years ago
Yamagishi Kazutoshi	931e66e572	Back to Web UI from tag page when signed in (#5943)	7 years ago
Eugen Rochko	70ce2a2095	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)	7 years ago
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	7 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	7 years ago
kibigo!	5bed0f10ed	Various fixes	7 years ago
David Yip	a807e3b71b	current_theme -> current_flavour (#229)	7 years ago