1358 Commits (e6e537d002565ded500e3bb190bab7e771f277c6)

Author	SHA1	Message	Date
Eugen Rochko	87af0bf6cf	Rate limit by user instead of IP when API user is authenticated (#5923) ... * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper	7 years ago
SerCom_KC	b14983a2a4	Update Chinese (Simplified) translations (#5937) ... * i18n: (zh-CN) Improve translations for email notifications * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Fix subject * i18n: (zh-CN) Update translations for #5933	7 years ago
Quenty31	5c12b555b4	l10n i18n OC update (#5939) ... * update and corrections * update (invites) * Update oc.yml * Update oc.yml	7 years ago
THE BOSS ♨	33b40397f8	Fix typo in paperclip.rb (#5936)	7 years ago
Eugen Rochko	f16141ebac	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago
Yamagishi Kazutoshi	f76681ebd6	Revert fog-aws (ref #5604) (#5934)	7 years ago
Jenkins	c6572ed6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	bcba7bba2d	Weblate translations (#5922) ... * Translated using Weblate (German) Currently translated at 84.2% (439 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (French) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 86.9% (453 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Korean) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 36.2% (189 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 53.1% (277 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Spanish) Currently translated at 75.6% (394 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (French) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (German) Currently translated at 88.2% (460 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Hebrew) Currently translated at 61.8% (322 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.5% (456 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.7% (457 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Portuguese) Currently translated at 42.4% (221 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Catalan) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (German) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.7% (473 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.9% (474 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.1% (475 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 90.4% (471 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 44.1% (19 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Portuguese) Currently translated at 47.7% (249 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 29.9% (156 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Polish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * i18n-tasks normalize * yarn run manage:translations * Restore wrongly removed translations	7 years ago
kibigo!	e614dc144e	Fixed webpack skin folder globbing	7 years ago
SerCom_KC	d0875b6a93	Improve Chinese (Simplified) translations (#5911) ... * i18n: (zh-CN) Change `管理` (moderation) to `运营` * i18n: (zh-CN) Improve translations	7 years ago
Quenty31	57e0d88c19	OC language update (#5905) ... * Update * update * Update oc.yml * bundle exec i18n-tasks normalize * Update oc.yml	7 years ago
Jenkins	33fc1fbe2a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	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
nightpool	df636e03c8	fix weblate for ja (#5906)	7 years ago
David Yip	bb1b4b2967	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
NCLS	1ad81d38a6	Update ja.yml	7 years ago
Jenkins	a3a7b6a848	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Marcin Mikołajczak	e3422e363b	i18n: 🇵🇱 (#5903) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	b037fbf9f4	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	7 years ago
SerCom_KC	125ad3e931	Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849) ... * i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts	7 years ago
kibigo!	fd7be49523	Various fixes	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
mayaeh	ce44b3b17a	Add Japanese translations for invite filter. (#5869)	7 years ago
Marcin Mikołajczak	c2f8e326cc	i18n: 🇵🇱 (#5865)	7 years ago
Yamagishi Kazutoshi	1447ef1d44	Add invite filter (#5862)	7 years ago
kibigo!	36b9f4df56	Skins support	7 years ago
Jenkins	e8446e3724	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Marcin Mikołajczak	b95f1b130a	i18n: 🇵🇱 (#5851) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	598be148e7	Update Japanese translations. (#5844)	7 years ago
David Yip	cad2e7773c	Normalize pl translation.	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
nullkal	35e3791ba4	Fix account migration feature (#5837) ... * Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting	7 years ago
Marcin Mikołajczak	5f51992e16	i18n: 🇵🇱 (#5841) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
David Yip	bc10a0dced	Merge remote-tracking branch 'tootsuite/master'	7 years ago
David Yip	bc9fd8e05a	Normalize config/locales/en.yml.	7 years ago
Eugen Rochko	55d9abcceb	Add UI for setting up account migration (#5832)	7 years ago
Jenkins	36452d6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mayaeh	37f152b347	i18n: Update ja translation for consumable invites. (#5829) ... * Add Japanese translation for consumable invites. * Add Japanese translation. * Update Japanese translation.	7 years ago
David Yip	c9dd67a733	Merge remote-tracking branch 'origin/master' into gs-master	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
spla	eddbf2e485	Updated Catalan strings (#5801) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml	7 years ago
Jenkins	7fcbe5faee	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	6a6e49d032	Change navigation link for moderators (#5812)	7 years ago
mayaeh	9a930c0623	i18n: Update ja translations (#5804) ... * Add Japanese translations. * Update Japanese translations. * Fix japanese translation.	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
Jenkins	96302f7fd4	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
SerCom_KC	97bb620b48	i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)	7 years ago
kibigo!	eadf1c38a5	Minor fixes	7 years ago
Jenkins	a2e4d79b1c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mayaeh	9841d20c97	Add Japanese translations. (#5769)	7 years ago
Marcin Mikołajczak	00be86c25d	i18n: Update Polish translation - back-end (#230) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Joan Montané	daec402a58	Update and fix Catalan translation (#5773) ... * Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	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
mayaeh	52111769d0	i18n: Update ja translation for moderator badge. (#5731) ... * Update Japanese translation for moderator badge. * Follows English notation	7 years ago
Lynx Kotoura	8a8bea2e53	Remove translations of default theme (#5741)	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
beatrix	34ba45e47c	Merge pull request #226 from glitch-soc/glitch-theme ... Glitch/Vanilla themes	7 years ago
Marcin Mikołajczak	1f5f446f08	i18n: Update Polish translation (#5749)	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	cea7dec340	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
SerCom_KC	e618b6c136	Updating Chinese (Simplified) translations (#5725) ... * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728	7 years ago
kibigo!	b8fdcfd55e	Sets default theme to glitch	7 years ago
David Yip	f1279d8ff3	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
Eugen Rochko	e149067561	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	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
Yamagishi Kazutoshi	b80a35092e	Redirect to reports when moderator (#5733)	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
mayaeh	7ffee9cc9d	Add Japanese translation for DM block option. (#5704)	7 years ago
Eugen Rochko	a71791e3f1	Allow specifying STATSD_NAMESPACE (#5700)	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
SerCom_KC	66a0141691	Updating Chinese (Simplified) translations (#5643) ... * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e886213e827cd985d4f62419db57534. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	7 years ago
Marcin Mikołajczak	fa89e5d911	i18n: Update Polish translation (#5699) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	5aca968bb7	Add Japanese translations for moderator roles and its own admin actions. (#5689)	7 years ago
Marcin Mikołajczak	57ea54ba00	i18n: fix typo in Polish translation (#5688)	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
KEINOS	e6285715d1	Fix #5652 - Notify too short when abbrev in JA (#5664) ... * Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`	7 years ago
Marcin Mikołajczak	df48eaec32	i18n: Update Polish translation (for #5635) (#5661) ... * i18n: Update Polish translation (for #5635) * 😑🔫	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
Matt	826dc9ee46	Update en.yml (#5648) ... Changed "Toots with replies" to read "Toots and replies"	7 years ago
Marcin Mikołajczak	5e43ce1fcb	i18n: Update Polish translation (#5639) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
nullkal	a12cc41dd4	Translate ja (#5637)	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
MitarashiDango	7a5fb781ce	Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)	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
Yamagishi Kazutoshi	a624688ebd	Unify file upload to using fog (#5604)	7 years ago
Marcin Mikołajczak	a0e1e14a90	i18n: Improve Polish translation (#5596) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Yamagishi Kazutoshi	f0d800d9a9	Update extract-text-webpack-plugin to version 3.0.2 (#5584)	7 years ago
beatrix	0daa95befb	add memorial to production.rb ... in memory of Natalie Nguyen let her name ring through the ether	7 years ago
Quenty31	b6f057365d	l10n Occitan (#5586) ... * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	7 years ago
MitarashiDango	3068add21d	add account search condition (instance domain) (#5577)	7 years ago
Yamagishi Kazutoshi	395a88eb5d	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	7 years ago
Nolan Lawson	ba22580c06	Add ServiceWorker caching for static assets (#5524)	7 years ago
Yamagishi Kazutoshi	10b30bd94e	Update dependencies for Ruby (2017-10-30) (#5566) ... * Update better_errors to version 2.4.0 * Update binding_of_caller to version 0.7.3 * Update bootsnap to version 1.1.5 * Update browser to version 2.5.2 * Update capistrano to version 3.10.0 * Update capistrano-bundler to version 1.3.0 * Update capistrano-rbenv to version 2.1.2 * Update capybara to version 2.15.4 * Update cld3 to version 3.2.1 * Update fabrication to version 2.18.0 * Update fog-openstack to version 0.1.22 * Update kaminari to version 1.1.1 * Update lograge to version 0.7.1 * Update nokogiri to version 1.8.1 * Update oj to version 3.3.9 * Update ox to version 2.8.1 * Update parallel_tests to version 2.17.0 * Update pkg-config to version 1.2.8 * Update rspec-rails to version 3.7.1 * Update rubocop to version 0.51.0 * Update scss_lint to version 0.55.0 * Update sidekiq to version 5.0.5 * Update sidekiq-scheduler to version 2.1.10 * Update tzinfo-data to version 1.2017.3 * Update webpacker to version 3.0.2 * bundle update	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
Alda Marteau-Hardi	29559b2e7a	Fix a grammatical error in the notifications. (#5555)	7 years ago
Marcin Mikołajczak	dc5053109b	i18n: Update Polish translation (#5547)	7 years ago
Akihiko Odaki	38d5aa3073	Use contenthash for ExtractTextWebpackPlugin (#5462) ... [hash] is not documented.	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
Jenkins	cfc46d7334	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Ratmir Karabut	51d4add08d	Update Russian translation (#5517) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	7 years ago
Anna e só	93255b003f	l10n: PT-BR translation updated (#5530)	7 years ago
Matthew Walsh	737ab88c86	Added a timeline for Direct statuses ... * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	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	ecef91e5ca	Some typos and supplementation in sentence structures (#5441) ... * 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 * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	7 years ago
Jeroen	6235b8a8b1	Dutch: A few strings I found last minute (#5440) ... * Dutch: A few strings I found last minute * Update simple_form.nl.yml	7 years ago
JeanGauthier	a18201f690	i18n better wording (OC/CA/FR) + string added in FR (#5438) ... * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	7 years ago
Jakob Kramer	15ae7fe6b2	Update German translation (#5425)	7 years ago
Yamagishi Kazutoshi	d7063885bc	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	7 years ago
Yamagishi Kazutoshi	5e6b51e2c9	Normalize locale files (#5429)	7 years ago
masarakki	f76a224328	use-DB_NAME-in-development (#5430)	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
Jeroen	289723dd1c	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	7 years ago
David Yip	e19bc7835a	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
Marcin Mikołajczak	8953c2a918	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	c102025e2c	i18n ultim hour «More» dropdown title + reduce motion (#5415) ... * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	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
voidSatisfaction	23dad325da	Add up-to-date korean translation on serverside (#5400) ... * chore: add korean translation on ko.yml * feat: add simple form korean translation up-to-date	7 years ago
JeanGauthier	2b099f9f2e	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	7 years ago
Yannick A	c03e2d7c51	Update French translation (#5401)	7 years ago
spla	9fc9d3554d	Updated Catalan strings (#5323) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	7 years ago
Yannick A	7b717319f6	Update French translation (#5384) ... Update French translation	7 years ago
Masoud Abkenar	5c26c3062d	l10n: update Persian translation for 2.0 (#5391)	7 years ago
Mathias B	1df10e26a8	Correct some misspellings (#5381) ... * Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'	7 years ago
Anna e só	02d14fd373	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	7 years ago
Jeroen	682bf2d624	Updating more Dutch strings for 2.0 (#5359)	7 years ago
Alda Marteau-Hardi	dfde574160	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	7 years ago
JohnD28	77cd62882b	Update fr.yml (#5330) ... * Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.	7 years ago
David Yip	7d0cf5a6a1	Merge tag 'v2.0.0rc2' into gs-master	7 years ago
Marcin Mikołajczak	b9eb3c264b	i18n: Update Polish translation (#5346) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	60152a421a	Moderation notes (#5344)	7 years ago
nullkal	38e5d51b42	Update ja.yml (#5342) ... * Update ja.yml * Update simple_form.ja.yml	7 years ago
Sylvhem	ad4d5aaf96	Fixes and updates for the French translation (#5340) ... * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
JohnD28	c66403114c	Update doorkeeper.fr.yml (#5317)	7 years ago
Nolan Lawson	82ff80dbad	Remove prop types from external libraries (#5304)	7 years ago
Jakob Kramer	d24ea1df74	Update German translation (#5302)	7 years ago
Jeong Arm	a5582bf9f5	Remove timestamps on any option (#5282)	7 years ago
unarist	12bdbf38ba	Fix migration failure due to StrongMigrations on production env (#5283)	7 years ago
Eugen Rochko	007fce8c10	Set snowflake IDs for backdated statuses (#5260) ... - Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future	7 years ago
m4sk1n	d9e51960a2	i18n: Update Polish translation (#5270) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	094616ad3f	Translate some Esperanto (#5252) ... * Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format	7 years ago
JeanGauthier	5bff1ad44e	i18n update Occitan (#5263) ... * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	7 years ago
Nolan Lawson	7bde8dcc08	Use ES module build of react-router-dom (#5264)	7 years ago
DJ Sundog	c3e5510289	adding support for audio uploads, transcoded to mp4 videos	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
Eugen Rochko	60925ce0ae	Encode custom emojis as resolveable objects in ActivityPub (#5243) ... * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	7 years ago
Jeong Arm	9ea15ab021	Korean translation (#5244) ... * [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci	7 years ago
m4sk1n	84780cbd96	i18n: Update Polish translation (#5255) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	27fd33256c	Clean up code style of Mastodon::TimestampId module (#5232) ... * Clean up code style of Mastodon::TimestampId module * Update brakeman config	7 years ago
Eugen Rochko	b4af50c521	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Lynx Kotoura	4e822d41b9	adjust public profile pages 2 (#5223)	7 years ago
Jakob Kramer	53105c4210	Update German translation (#5221)	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
aschmitz	4f7aa88461	Configure webpack to poll for changes in development (#5040) ... * Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.	7 years ago
Yamagishi Kazutoshi	f7d7a92d57	Add missing Japanese translations (#5193) ... * yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"	7 years ago
Jakob Kramer	902e249cdb	Update German translation (#5189)	7 years ago
m4sk1n	17bcb30c82	i18n: Update translation files and Polish translation (#5180) ... * Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	ee21576c19	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
JeanGauthier	941a1532f2	l10n Update OC: reorganization pref. page (#5168)	7 years ago
Eugen Rochko	06ef1b0ac4	Reorganize preferences page (#5161)	7 years ago
Eugen Rochko	5983fa43f5	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
roikale	4f18c27c43	Change wording on landing page. (#4805) ... "Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto	7 years ago
Nishi, Keisuke	8f344b7bb0	Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)	7 years ago
Jakob Kramer	6f2a885ea3	Updated German translation (#5151) ... Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.	7 years ago
Yanaken	e65378e808	Better Japanese translations (#5142)	7 years ago
Eugen Rochko	6033b8eac1	Replace self-rolled statsd instrumention with localshred/nsa (#5118)	7 years ago
Jakob Kramer	d55a6ae28a	Update German translation (#5133) ... Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)	7 years ago
JeanGauthier	0f0791c563	OC 500 error (#5110)	7 years ago
Eugen Rochko	795e624d5d	Add ability to specify alternative text for media attachments (#5123) ... * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	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
Eugen Rochko	7031e350b3	When OAuth password verification fails, return 401 instead of redirect (#5111) ... Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.	7 years ago
Yamagishi Kazutoshi	12b7306a03	Upgrade Webpacker to version 3.0.1 (#5122)	7 years ago
m4sk1n	7291f1de08	i18n: Update Polish translation (#5106) ... * i18n: Update Polish translation * i18n: Update Polish translation	7 years ago
kibigo!	cae9e7ab76	Fixed webpack config code	7 years ago
kibigo!	aac16a82d6	Better themeing support!!	7 years ago
Eugen Rochko	10a2b3dd4c	Follow-up to #4582 and #5027, removing dead code (#5101)	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	65827bd2b4	Add strong_migrations gem to warn when creating unsafe migrations (#5078)	7 years ago
Eugen Rochko	f621e05356	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)	7 years ago
Lynx Kotoura	88fd9f47fd	Fix theme translations alphabetically (#5031)	7 years ago
Eugen Rochko	f8e734ff9a	Disable private status federation over OStatus (#5027)	7 years ago
Lynx Kotoura	42bacb1e30	Better Japanese translations (#5030)	7 years ago
mayaeh	0e9e5e0317	Add Japanese translations for multiple themes, custom emoji (#5026) ... * Add Japanese translations for multiple themes * Change Japanese translation for custom emoji's created_msg.	7 years ago
JeanGauthier	acfb7a463e	l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023) ... * Oauto code string * Theme, custom emoji and more * Site theme * added two spaces wierdly gone away * Update oc.yml Changes adviced	7 years ago
mayaeh	d8a459820c	Add japanese translations for custom emoji. (#5007) ... * Add japanese translations for custom emoji. * Remove spaces. * Change destroyed_msg. * Revert "Change destroyed_msg."	7 years ago
m4sk1n	816175a1fb	i18n: Update Polish translation (#5015) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	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
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	327d21b8a4	Run i18n-tasks normalize (#5003)	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
unarist	938a99c89d	Re-allow underscore on valid_url_path_ending_chars (#4999) ... Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.	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
Patrick Figel	dde43a9e32	Randomize sidekiq-scheduler cron schedule (#4980) ... SubscriptionsScheduler in particular causes high load across the entire fediverse at 5 AM UTC every day. Randomizing cron schedules and/or adding a random delay is considered best practice to avoid this issue.	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
Eugen Rochko	26c797bf0d	When accessing uncached media attachment, redownload it (#4955) ... * When accessing uncached media attachment, redownload it * Prevent re-download of rejected media	7 years ago
Anna e só	584d2d8e02	l10n: PT-BR translation updated (#4953) ... * 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 * Fixed spelling on pt-BR.yml * Update pt-BR.json	7 years ago
sdukhovni	1fb5e3b009	Add scheduled worker to purge old user IPs (#4951) ... * Add scheduled worker to purge old user IPs * Use ruby 1.9 hash syntax	7 years ago
Yamagishi Kazutoshi	175c2a9df2	Add missing Japanese translations (#4947)	7 years ago
ふぁぼ原	c71727ca55	Enable to recognize most kinds of characters as URL paths (#4941)	7 years ago
Masoud Abkenar	d08cf543a3	l10n: update Persian translation (#4946)	7 years ago
abcang	579a7c2654	Revert unique retry job (#4937) ... * Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)" This reverts commit 0080804f44. * Revert "Do not execute the job with the same arguments as the retry job (#4814)" This reverts commit 892aeb7ffe.	7 years ago
m4sk1n	4d80e3c550	i18n: Update Polish translation (#4942) ... * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	7 years ago
Jeroen	8cd10e7df6	Another Dutch language update (#4944) ... * Update nl.json * Update nl.yml * Update nl.json	7 years ago
Quent-in	6279f70e60	l10n update OC/FR video redesign (#4938) ... * l10n update for Redesign video player (#4911) * Update videp * Update I hope this time format works well. * One missing string * Update time format I'd like the complete name of the month in the Long format and the short one in the short format. I hope it works now	7 years ago
N氏	3d5170251e	Add Japanese translate for #4913 (#4936)	7 years ago
Surinna Curtis	2bd218dfdb	Add a /api/v1/mutes/details route that just returns the array of mutes.	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
m4sk1n	5bcb431a46	i18n: Update Polish translation (#4929) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeroen	00b28a45b0	Updating Dutch translation (#4927) ... * Update doorkeeper.nl.yml * Update nl.yml * Update simple_form.nl.yml * Update nl.json * Update en.json * Update en.json * Update nl.json	7 years ago
Eugen Rochko	a47a5ab5cd	Fix #4918 - Limit pinned toots to 5 (#4923)	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
Patrick Figel	759bbdd9ca	Add OpenStack Keystone V3 support (#4889) ... Keystone V2 is deprecated in favour of V3. This adds the necessary connection parameters for establishing a V3 connection. Connections to V2 endpoints are still possible and the configuration should remain compatible. This also introduces a SWIFT_REGION variable for multi-region OpenStack environments and a SWIFT_CACHE_TTL that controls how long tokens and other meta-data is cached for. Caching tokens avoids rate-limiting errors that would result in media uploads becoming unavailable during high load or when using tasks like media:remove_remote. fog-openstack only supports token caching for V3 endpoints, so a recommendation for using V3 was added.	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
Masoud Abkenar	04183a9675	l10n: update Persian translation (#4880) ... * l10n: update Persian translation * l10n: fix missing Persian translation	7 years ago
David Yip	f90abccf33	Merge tag 'v1.6.0' into sync/upstream	7 years ago
m4sk1n	127d51bda7	i18n: Update Polish translation (#4881)	7 years ago
yoshipc	92bdd78105	Fix Japanese translation (#4876) ... I translated the additional text ( added by #4871)	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
Yamagishi Kazutoshi	4c0a563c0c	Set fallback address when empty notification address (#4868)	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
m4sk1n	1a4beb3122	i18n: Update Polish translation (#4845) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
abcang	0080804f44	Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)	7 years ago
Masoud Abkenar	add644eeb0	i18n: update Persian translation (#4822)	7 years ago
Adam Thurlow	57a821d4b9	swift-enable the paperclip! 📎 (#2322)	7 years ago
abcang	892aeb7ffe	Do not execute the job with the same arguments as the retry job (#4814)	7 years ago