5469 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
kibigo!	bdca1614d5	Screenshot support for themes	2017-12-10 20:32:28 -08:00
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
beatrix	08b0861b96	Merge pull request #250 from chriswmartin/fav-confirm-modal ... add favourite confirmation modal	2017-12-10 23:10:19 -05:00
beatrix	01a3461bef	Merge pull request #252 from ncls7615/glitch-langfiles ... i18n: Add translate and fix problems	2017-12-10 22:53:48 -05:00
Erin	288f1293ef	set local_only in a before_create callback instead of status service	2017-12-10 21:39:27 -06:00
Erin	0c46058a43	remove vestigial Status#local_only? definition	2017-12-10 21:25:36 -06:00
Erin	c1410af368	post_status_service.rb: save the status after setting local_only	2017-12-10 20:35:57 -06:00
Erin	24f36ca912	Status#not_local_only scope should match nils too	2017-12-10 20:35:42 -06:00
Sylvhem	84d5bfb35e	Change the disclaimer under the sign up form (#5817) ... * Change the disclaimer below the sign up form Change the disclaimer below the sign up form on the home page. The current text is linking to the /about/more page under "our terms of service" and to the /terms page under "privacy policy". This change intend to make the message more coherent. Change l’avertissement en-dessous du formulaire d’inscription sur la page d’accueil. Le texte actuel redirige vers /about/more sous un lien intitulé "nos conditions d’utilisation" et vers /terms via "notre politique de confidentialité". Ce changement vise à rendre le message plus cohérent. * Second take on the disclaimer A new version of the disclaimer, based on feedback. Une nouvelle version de l’avertissement, basé sur les premiers retours.	2017-12-11 02:30:43 +01:00
Erin	f080a9fac7	filter local-only toots from AP outboxes	2017-12-10 19:07:43 -06:00
ncls7615	d420e2f047	add comma	2017-12-11 09:50:52 +09:00
ncls7615	279231c5dd	" => '	2017-12-11 09:46:17 +09:00
ncls7615	a98b0a47ef	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles ... # Conflicts: # app/javascript/glitch/locales/ja.json	2017-12-11 09:43:21 +09:00
Erin	6bd18e43ba	filter local-only statuses from public pages	2017-12-10 17:23:01 -06:00
Erin	5ef65aab8f	replace reblog service check for an 👁️ with #local_only	2017-12-10 17:12:21 -06:00
Erin	cfbb95605b	set local_only flag on statuses in post_status_service	2017-12-10 17:04:32 -06:00
Erin	08519cd4f4	status: stub local_only?, add scope, add marked_local_only?	2017-12-10 17:04:28 -06:00
Erin	434c70fd98	add a local_only column to the statuses table	2017-12-10 16:41:25 -06:00
cwm	0466aa8d08	use single quotes in locale entry	2017-12-10 15:39:23 -06:00
cwm	072ab191cc	pulled master, moved locale entry to new location	2017-12-10 15:22:15 -06:00
cwm	eec5d350fd	removed unneeded actions_modal div	2017-12-10 15:14:56 -06:00
beatrix	26c9b9fa27	Merge pull request #246 from glitch-soc/theme-intl8n ... Internationalization for flavours and skins	2017-12-10 15:41:22 -05:00
kibigo!	64b839b769	Removed MORE theme localizns	2017-12-10 11:38:30 -08:00
kibigo!	cd107e92cb	Move ja localization to new locaiton	2017-12-10 11:09:59 -08:00
kibigo!	6b7085a33e	Linting fixes	2017-12-10 11:08:04 -08:00
kibigo!	1c728df92e	Only localize js when there's a theme	2017-12-10 11:08:04 -08:00
kibigo!	b28cd6769c	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
kibigo!	8394430081	Removed unused theme localization key	2017-12-10 11:08:04 -08:00
kibigo!	d08d0f9f33	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
Andrea Scarpino	6a82939adb	Fix account and tag searches with leading/trailing spaces (#5965) ... * Strip leading & trailing spaces from account query * Strip leading & trailing spaces from tag search	2017-12-10 19:35:46 +01:00
Lynx Kotoura	98aa96b8d6	Refix extraspace for emojis (#5964) ... Fix misalignment between emoji sizes	2017-12-10 17:56:05 +01:00
abcang	3caec1ecc2	Save media outside transaction (#5959)	2017-12-10 16:33:52 +01:00
cwm	066458a659	removed one last app settings addition	2017-12-10 09:25:44 -06:00
goofy-bz	2950de86c6	Update devise.fr.yml (#5963) ... ludicrously tiny but necessary typofix (wrong accent)	2017-12-11 00:24:29 +09:00
cwm	7a8711ccac	removed app settings additions	2017-12-10 09:10:47 -06:00
Quenty31	7d4ebeecbd	l10n i18n OC: corrections (#5962) ... * filling missing strings * Small changes Better way of saying + removed 2 finals dots * Corrections * Corrections Now with final point or without, just like the EN file * Update oc.json	2017-12-11 00:07:24 +09:00
ncls7615	0e56797792	add and fix	2017-12-10 17:33:22 +09:00
beatrix	282f48ddd1	Merge pull request #248 from chriswmartin/glitch-theme-lists ... add lists to glitch flavour!	2017-12-10 00:53:37 -05:00
beatrix	ef53c972b1	Merge pull request #237 from dexamphetamine/jpn-localization ... i18n: add ja glitch strings	2017-12-09 23:34:13 -05:00
amphetamine	eb2b971a52	i18n: add ja glitch strings	2017-12-09 19:39:41 -08:00
Yamagishi Kazutoshi	6e3f176b8e	Add Galician language support (#5955)	2017-12-10 04:19:07 +01:00
Olivier Humbert	a4710f9af8	French translation update (#5954) ... * Update French translation * fix	2017-12-10 09:47:59 +09:00
abcang	fcc0795a40	Remove unused function (#5950)	2017-12-09 23:37:31 +01:00
ButterflyOfFire	0f8140d26a	Create activerecord.ar.yml (#5951)	2017-12-09 23:37:18 +01:00
cwm	8606e53384	moved locales to glitch, created add settings entry	2017-12-09 15:15:11 -06:00
cwm	fbd2a0127c	ran i18n-tasks normalize for simple_form.en.yml	2017-12-09 13:00:07 -06:00
cwm	c5a688d70e	remove trailing spaces	2017-12-09 12:41:24 -06:00
cwm	7284e36fbd	fixed fav setting change	2017-12-09 12:17:20 -06:00
cwm	22cdbca82c	fixes, functioning now	2017-12-09 12:06:00 -06:00
cwm	a489e5d5cd	added a few more things	2017-12-09 11:21:41 -06:00