922 Commits (ec18363c3b4163dc2f36fd0bf3bd7caf22dfa8ce)

Author	SHA1	Message	Date
David Yip	ec18363c3b	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
David Yip	d199a8c612	Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification ... Avatar unification, mk.II	7 years ago
Matthew Walsh	078319992b	1.6 changed files for unified avatar styling -- updated to restore unity	7 years ago
David Yip	b015ab4e94	Merge pull request #173 from glitch-soc/zerowidthmoji ... use zerowidth spaces with emojis	7 years ago
Eugen Rochko	4a0367d04a	Clear timer when unmounting RelativeTimestamp components (#5408) ... Possibly the cause of #5379, #5377	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
Lynx Kotoura	9aacf21af7	Adjust public hashtag pages (#5357)	7 years ago
Ondřej Hruška	b88cae6c6b	replace newlines in desktop notif with spaces instead of removing them (#5361)	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
Ondřej Hruška	f92d0bbda4	Doodle improvements 2 (#176) ... * Fix some doodle bugs and added Background color functionality * added protections against accidental doodle erase, screen size changing * resolve react warning about 'selected' on <option>	7 years ago
Jakob Kramer	2425ba45ae	Update German translation (#5389)	7 years ago
Ondřej Hruška	a438c1dc83	Doodle palette, options, fill tool (#172)	7 years ago
Ondřej Hruška	4eb270dd19	use zerowidth spaces for emojis	7 years ago
Ondřej Hruška	0cca5ac567	Fixed a bug where the canvas would get transparent bg upon erase	7 years ago
Ondřej Hruška	f1f6d8220a	Initial doodle support	7 years ago
Jeroen	c07034708c	Dutch strings: small change (#5375) ... * Dutch strings: small change * And this too.	7 years ago
Eugen Rochko	284b078741	Do not try to guess why home timeline is empty in web UI (#5370) ... * Do not try to guess why home timeline is empty in web UI * Fix style issue	7 years ago
Eugen Rochko	bfc6479a96	When unfollowing, remove from home in web UI immediately (#5369) ... Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!	7 years ago
ThibG	2e88988fce	Reduce discrepancies between server and client-side character count (#5360)	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
Ondřej Hruška	e960e2c1d2	Fix the notification bug with newlines	7 years ago
David Yip	227824429b	Another tabs-vs-spaces fix, but with ~feeling~	7 years ago
Alda Marteau-Hardi	dfde574160	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	7 years ago
David Yip	3cc091d374	Fix tabs-vs-spaces issue pointed out by eslint.	7 years ago
JeanGauthier	7c06e0af86	Update oc.json (#5343)	7 years ago
David Yip	7d0cf5a6a1	Merge tag 'v2.0.0rc2' into gs-master	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
Ondřej Hruška	d08756cfc3	Fix our media gallery not having alt text and tooltips	7 years ago
Ondřej Hruška	f8749b268c	workaround for scrollIntoView bug ???	7 years ago
Ondřej Hruška	132a22ace5	Merge remote-tracking branch 'upstream/master'	7 years ago
Jeroen	e3717ffadc	Updating Dutch strings for 2.0 (#5334)	7 years ago
Alda Marteau-Hardi	ae4345e6d4	Use gender neutral language as in the rest of the french translation (#5331)	7 years ago
Lynx Kotoura	75e036b493	Fix styles of error pages (#5335) ... Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>	7 years ago
kibigo!	037d7478af	Removed length check which now happens in reducer	7 years ago
kibigo!	215da1a03c	Fixed header emojification	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
Eugen Rochko	794e015ea2	In thread view, only scroll first update, scroll to replied-to post (#5322)	7 years ago
Eugen Rochko	6e729f42c3	Fully disable hotkeys when input element is focused (#5324) ... Because alt+n is a way to enter some kinda letter on some keyboard	7 years ago
JohnD28	eacf9b9039	Update french translation : mastodon/locales/fr.json (#5318) ... * Update fr.json * Update fr.json * Update fr.json	7 years ago
ButterflyOfFire	ffe158fc96	Update ar.json (#5316) ... Pushing new arabic translated strings for Mastodon web client.	7 years ago
unarist	2b29f5b5f1	Fix an error when ancestors get loaded before the status itself (#5312) ... When ancestors get loaded, we scroll to the target status (i.e. skip ancestors). However, ancestors may get loaded before the status itself, then it causes TypeError because `this.node` is undefined yet. Since we don't show anything until the status gets loaded, we don't need to scroll to the target status in this time. If we get the status itslef later, it causes `componentDidUpdate` and scrolling correctly.	7 years ago
Eugen Rochko	6fc71ff7f2	Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309) ... AZERTY layouts require pressing shift to press a number at all, so it triggers a column switch even when simply typing numbers in textarea	7 years ago
Eugen Rochko	af93f234ab	Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)	7 years ago
Eugen Rochko	4c6adaf4f4	Fix #5295 - Order custom emoji lexicographically (#5297)	7 years ago
unarist	9c448a0280	Fix an error when video playback buffer is empty (#5300)	7 years ago
Eugen Rochko	4a09a62f98	Center error layout (#5289)	7 years ago
Eugen Rochko	f8ec132261	Track frequently used emojis in web UI (#5275) ... * Track frequently used emojis in web UI * Persist emoji usage, but debounce commits to the settings API * Fix #5144 - Add tooltips to picker * Display only 2 lines of frequently used emojis	7 years ago