7438 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eugen Rochko	1356ed72cd	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	2017-12-12 03:55:39 +01:00
Eugen Rochko	481fac7c84	Exclude moved accounts from search results (#5984)	2017-12-12 02:14:33 +01:00
cwm	0a52e37648	change pack to 'auth'	2017-12-11 18:14:41 -06:00
cwm	44992df257	load pack	2017-12-11 17:54:40 -06:00
Erin	2efffe77dc	reblog_service.rb: Status#local_only -> local_only?	2017-12-11 17:39:11 -06:00
Erin	c5a4eda694	move outbox filtering to Status#permitted_for (as per @ekiru)	2017-12-11 15:28:04 -06:00
Erin	3ec47e732b	post_status_service: stylistic change (local_only -> local_only?)	2017-12-11 15:27:31 -06:00
Quenty31	c588fcf4bc	Tiny little change (#5981)	2017-12-11 20:53:29 +01:00
kibigo!	8aa527434c	Fixed index in webpack config	2017-12-11 10:45:21 -08:00
beatrix	7d024a6b68	Merge pull request #259 from KnzkDev/flavours-ja ... i18n: Add ja translate for flavour/skin ux	2017-12-11 10:56:41 -05:00
ncls7615	d8206d1931	add ja	2017-12-12 00:28:33 +09:00
beatrix	771b950feb	Merge pull request #254 from glitch-soc/new-theme-ux ... New flavour/skin UX	2017-12-11 09:36:14 -05:00
Eugen Rochko	feed07227b	Apply a 25x rate limit by IP even to authenticated requests (#5948)	2017-12-11 15:32:29 +01:00
beatrix	0cd5f2a61f	Merge pull request #255 from KnzkDev/remove-picture ... Remove getting-started picture	2017-12-11 09:08:13 -05:00
Akihiko Odaki	e56323a4dd	Remove preview_card fabricator (#5975) ... preview_card fabricator has a removed attribute, status, and is no longer functional.	2017-12-11 22:22:08 +09:00
David Yip	204688e803	Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.	2017-12-11 00:17:30 -06:00
ncls7615	9d5ecdbf41	remove picture	2017-12-11 13:52:17 +09:00
David Yip	1138d0c321	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
kibigo!	ed7231947c	Added styling	2017-12-10 20:32:28 -08:00
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