6971 Commits (4850a2348c8917ae60cb6213ebd70b6105217c43)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	71399bf1d5	HTTP signatures spec no longer requires algorithms field (#7525) ... Fix #7520	7 years ago
ThibG	71a8e10275	Merge pull request #486 from ThibG/glitch-soc/merge-upstream ... Merge changes from upstream	7 years ago
Thibaut Girka	7d5dbed502	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	7 years ago
ThibG	d3117e444d	Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu ... [Glitch] Feature: Direct message from menu	7 years ago
ThibG	ec8a7b4164	Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color ... Fix mastodon-light background color of the composer textarea when posting	7 years ago
Thibaut Girka	04eeaa0fa4	[Glitch] Reword the direct message warning ... Port 53c2164e9c to glitch-soc	7 years ago
Thibaut Girka	c77a4d8c51	[Glitch] Feature: Direct message from Statuses ... Port 7a06bd7085 to glitch-soc	7 years ago
Thibaut Girka	a8d5a4a74e	[Glitch] Fix issues with sending direct messages from user profile ... Port 4be5383b91 to glitch-soc	7 years ago
Thibaut Girka	c5d2dcb562	[Glitch] Feature: Direct message from menu ... Port df62fc20bf to glitch-soc	7 years ago
Thibaut Girka	8567ffd27d	Fix mastodon-light background color of the composer textarea when posting	7 years ago
MIYAGI Hikaru	a922fb60f5	Fix posix-spawn to version 0.3.12 (#7517) ... Because 0.3.13 causes build error in x86 or other ILP32 environments. closes #7453	7 years ago
Evgeny Petrov	e503a61a5a	Russian language for 2.4.0 (#7512) ... * Russian language for 2.4.0 * Russian language for 2.4.0 * bundle exec i18n-tasks normalize * RU: Updated some strings after new commits appeared	7 years ago
Eugen Rochko	8adcc1d806	Fix images resized in browser getting cropped (#7514) ... Fix #7487	7 years ago
Technowix	f98e09bfaf	French translation tweaks (#7513) ... - Use more neutral terminology for readability. - Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product". - Some fixes for accounts.	7 years ago
Quentí	b64100c049	[l10n] Occitan update (#7505) ... * Update oc.json * Update doorkeeper.oc.yml * Update oc.yml * Update simple_form.oc.yml * Update oc.json Accept is the opp. of reject, I think it's better like this. * bundle exec i18n-tasks normalize	7 years ago
nightpool	ebce199209	Update bot preference text (#7507) ... * Update simple_form.en.yml * fix #2	7 years ago
Sylvhem	6dfe10ff1e	Reword the direct message warning (#7420) ... * Change direct message warning Reword the direct message warning to set proper privacy expectations. * Update the French translation Update the French translation to reflect the changes made to the direct message warning. * Wording update Update the message's wording according to the feedback.	7 years ago
Akihiko Odaki	a81b1e6f10	Do not use permitted_for scope when querying pinned statuses (#7510) ... permitted_for scope is slow when combined with pinned status scope. Fortunately permitted_for scope can safely be removed because a pinned status is always public.	7 years ago
Akihiko Odaki	5dadb6896b	Raise Mastodon::RaceConditionError if Redis lock failed (#7511) ... An explicit error allows user agents to know the error and Sidekiq to retry.	7 years ago
Akihiko Odaki	7dd6224ca1	Let navigator follow redirect instead that handling redirect in fetch (#7500) ... * Let navigator follow redirect instead that handling redirect in fetch * Do not use cache when fetched resource is to redirect	7 years ago
Akihiko Odaki	4e09854ccb	Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506)	7 years ago
Akihiko Odaki	95b2bead0f	Test if navigator.storage.estimate exists before using it (#7504)	7 years ago
Akihiko Odaki	82582dac2b	Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503)	7 years ago
Marcin Mikołajczak	73f4c61bbd	🌍: 🇵🇱⬆️ (#7494) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
unarist	63a10a7ffe	Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) ... This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.	7 years ago
Renato "Lond" Cerqueira	933f6e2ad4	Weblate translations 20180515 (#7496) ... * Translated using Weblate (Catalan) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Korean) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Dutch) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (French) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Slovak) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.3% (623 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 98.4% (63 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Arabic) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (294 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Galician) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 7.8% (5 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 12.5% (8 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovenian) Currently translated at 11.9% (75 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 14.1% (89 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Japanese) Currently translated at 99.5% (624 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (625 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Remove translations causing issues in arabic Related to #6673	7 years ago
Akihiko Odaki	156fc9ab20	Clone response before using when caching web page (#7498)	7 years ago
ThibG	eb6c1da920	Merge pull request #483 from ThibG/glitch-soc/fixes/modal ... Fix modals testing for props.noEsc (fixes #482)	7 years ago
Thibaut Girka	f7b9911f71	Fix modals testing for props.noEsc (fixes #482)	7 years ago
Wiktor	37136f5986	Fix account URI when updating ActivityPub account (#7488) ... Updates account `uri` field on each call to `update_account` instead of only once during `create_account` to mirror the same behavior in OStatus `ResolveAccountService` class [0]. ActivityPub accounts are identified using `@username` and `@domain` pair instead of URI since #6842. This fixes #7479: a bug when the account identified by `@username` and `@domain` changes its URI. [0]: 060fa11ee2/app/services/resolve_account_service.rb (L121)	7 years ago
David Yip	edc99abc02	Merge pull request #476 from ThibG/fixes/update-scss ... Change local settings SCSS to be more consistent with modals	7 years ago
Thibaut Girka	873f33d9ff	Change local settings SCSS to be more consistent with modals	7 years ago
David Yip	d7608450f1	Merge pull request #481 from ThibG/glitch-soc/merge ... Merge upstream changes	7 years ago
Thibaut Girka	efd2441d1f	Merge branch 'master' into glitch-soc/merge	7 years ago
Akihiko Odaki	060fa11ee2	Disallow async function in service worker (#7482) ... offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6 uses uglify-js 2.8.29, which is not compatible with async function.	7 years ago
Akihiko Odaki	fee0b5f372	Revert index change on statuses for api/v1/accounts account_id statuses (#7484)	7 years ago
Eugen Rochko	dceab1af01	Bump version to 2.4.0rc3	7 years ago
Akihiko Odaki	0205536ee7	Limit environment variables to expose to webpack (#7480)	7 years ago
Eugen Rochko	759b2b9c99	Bump version to 2.4.0rc2	7 years ago
Yamagishi Kazutoshi	4d5bec8a75	Add Slovene language (#7475)	7 years ago
abcang	e6c952476c	Call media.present? because media may be nil (#7474)	7 years ago
Akihiko Odaki	28629d7921	Improve index on statuses for api/v1/accounts account_id statuses (#7476) ... Queries with the combination of account_id, id, and visibility can be categorized in three types: 1. Querying for public and unlisted to enumerate statuses visible to anyone. 2. Querying for public, unlisted, and private to enumerate statuses visible to follower. 3. Querying for direct to enumerate own direct statuses. 1 and 2 is covered by the index with condition 'visibility IN (0, 1, 2)'. It would bring better performance in case that there are many direct statuses. The index with condition 'visibility = 3' is just for 3. It would be much faster to query direct statuses thanks to this query. The total size of those two indexes are expected to be smaller than the deleted one because they are partial and does not have to cover all the table.	7 years ago
beatrix	b221cc1707	Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme ... Port Sylvhem's mastodon-light to glitch flavour	7 years ago
Eugen Rochko	b0e1211eec	Fix 404 for GET /api/v1/push/subscription (#7472) ... My bad...	7 years ago
Eugen Rochko	7463d87ec3	Add GET /api/v1/push/subscription REST API (#7471) ... * Add Api::V1::Push::SubscriptionsController#show * Add to routes	7 years ago
Eugen Rochko	52a2498f60	Fix nil error in StatusFilter (#7470) ... Fix #7462	7 years ago
Akihiko Odaki	cffde88361	Test if navigator.storage is present before using it (#7460)	7 years ago
Yamagishi Kazutoshi	efc482361b	Open video modal on public UI (#7469)	7 years ago
Yamagishi Kazutoshi	15a8a75117	Update http_parser.rb to head version (#7467)	7 years ago
ThibG	6e5b5d557c	Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape ... Fix glitch-style bio fields incorrect HTML escaping in public profiles	7 years ago