5599 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Akihiko Odaki	35fdf561be	Refactor web_push_subscription (#6047) ... * Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action	2017-12-24 04:47:35 +01:00
Chris	081956742c	removed references to hideOnMobile in column_link and getting_started (#6082) ... * removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users	2017-12-24 04:47:02 +01:00
cpsdqs	8528fd89d2	Move dropdown transform origin to top edge (#6091)	2017-12-24 00:53:03 +01:00
Jenkins	6d00ca1c71	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-22 04:17:14 +00:00
beatrix	4a7782d5c9	Merge pull request #280 from KnzkDev/add-en-ja ... i18n: Add en and ja	2017-12-21 22:49:30 -05:00
ncls7615	fb57ec41df	Update and add some translate	2017-12-22 12:22:41 +09:00
ncls7615	4694dcfe16	Add more en and ja	2017-12-22 12:11:28 +09:00
ncls7615	02db8aa3a0	Add en and ja	2017-12-22 12:01:38 +09:00
nightpool	9592b5e31e	enforce LOCAL_HTTPS=true in production (#6061) ... * enforce https in production * note changes in production env sample * typo fix	2017-12-22 02:17:59 +01:00
ThibG	cea98e0c12	Reduce the number of synchronous resolves when posting toots (#6075)	2017-12-22 02:15:08 +01:00
ThibG	6eb60260b1	Display deleted users' role as “Suspended” (#6080) ... Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead.	2017-12-22 02:14:17 +01:00
beatrix	60d415bc5e	Merge pull request #266 from chriswmartin/getting-started-improvements ... Getting started column improvements	2017-12-21 18:47:07 -05:00
beatrix	f78d169d71	Merge pull request #278 from KnzkDev/fix/acc-header-avatar ... Fix account header avatar	2017-12-21 17:46:53 -05:00
ncls7615	191b625a27	Fix account header avatar	2017-12-22 07:12:49 +09:00
beatrix	a3cb5a6b64	Merge pull request #277 from glitch-soc/273-add-data-status-by-to-detailed-status ... Add data-status-by back to DetailedStatus component. Fixes #273.	2017-12-21 16:10:36 -05:00
David Yip	7bb99ca3cf	Add data-status-by back to DetailedStatus component. Fixes #273.	2017-12-21 13:22:33 -06:00
cwm	d736739e8f	<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)	2017-12-21 13:04:40 -06:00
cwm	7917d45396	remove themes.default from i18n-tasks unused check	2017-12-21 12:45:11 -06:00
beatrix	bc0152974f	Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab ... Wrap <Avatar> in account header in a link to that account's page (fixes #245)	2017-12-21 08:30:22 -05:00
beatrix	4d34b3495d	Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages ... Set packs on 2FA-related pages. Fixes #271.	2017-12-21 08:30:05 -05:00
David Yip	dbd5f8b9a5	Wrap <Avatar> in account header in a link to that account's page. Fixes #245.	2017-12-21 05:25:16 -06:00
David Yip	00d1f8eea1	Remove themes.default from i18n-tasks unused check ... This translation key comes in from tootsuite, but the flavours system does not use it.	2017-12-21 05:24:17 -06:00
David Yip	a1ddc89da6	Remove unused themes.default key in ko locale.	2017-12-20 20:02:50 -06:00
cwm	9042f9a813	add keyboard shortcuts to getting started (fixes #275)	2017-12-20 09:50:29 -06:00
David Yip	bf1eb0912c	Set packs on 2FA-related pages. Fixes #271. ... Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor	2017-12-20 03:15:54 -06:00
Jenkins	6f11aa8383	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-20 08:17:15 +00:00
Akihiko Odaki	81d29e4126	Rename settingKey in setting_toggle to settingPath (#6046)	2017-12-20 16:19:59 +09:00
Neetshin	c11a52d888	Replace <code> to <kbd> in KeyboardShortcuts component (#6049) ... * Add aria-autocomplete='list' in Textaria ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete * Make detect empty string brefore assign upload description * Change code elements in keyboard-shortcuts component to kbd	2017-12-20 11:46:25 +09:00
Jeong Arm	e52293482e	Update Korean translation (#6050) ... * Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form	2017-12-20 11:45:50 +09:00
beatrix	6cb47f17fc	Merge pull request #272 from KnzkDev/add-en-ja ... i18n: Update some locale files	2017-12-19 10:35:02 -05:00
ncls7615	d3b2677775	Add en and ja	2017-12-19 20:16:48 +09:00
cwm	14aae9c05c	missed a semicolon	2017-12-17 22:21:15 -06:00
cwm	be50e45a74	use makeMapStateToProps	2017-12-17 22:00:25 -06:00
cwm	e4ebbf4f07	use list-ul icon in list header and web/lists	2017-12-17 21:25:18 -06:00
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-17 03:17:14 +00:00
Peter	f38e6a14f2	Add Slovak translation (#6052) ... * Add Slovak translation * Slovak translation: i18n-normalize	2017-12-17 11:26:42 +09:00
Jenkins	05a2a70ca2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-16 15:17:12 +00:00
beatrix	e202efdf8a	Merge pull request #253 from glitch-soc/prevent-local-only-federation ... prevent federation of local-only statuses	2017-12-16 09:26:48 -05:00
beatrix	5325c2ab3e	Merge pull request #270 from KnzkDev/fix/action_logs ... Fix admin/action_logs page	2017-12-16 09:25:57 -05:00
ncls7615	9e8fa3caee	fix admin/action_logs page	2017-12-16 20:27:26 +09:00
kibigo!	e677dda07c	Fixes #244 to make search results scrollable	2017-12-15 12:49:23 -08:00
Daigo 3 Dango	a434d9c0cc	Remove period from the version number (#6039) ... 2.1.0. -> 2.1.0	2017-12-15 21:38:25 +01:00
David Yip	82b2e224a2	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	2017-12-15 12:20:56 -06:00
Jenkins	40afadfb01	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-15 18:17:14 +00:00
Eugen Rochko	a29432f0cd	Bump version to 2.1.0 🎆	2017-12-15 19:14:57 +01:00
beatrix	e0a573a2ce	Merge pull request #269 from ncls7615/patch-1 ... Update ja.js	2017-12-15 09:12:54 -05:00
NCLS	e9a5bde9a0	Update ja.js	2017-12-15 19:43:10 +09:00
NCLS	61ed5b972c	Update ja.js	2017-12-15 19:38:13 +09:00
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-15 01:17:12 +00:00
Eugen Rochko	098c7d27fe	Bump version to 2.1.0rc6	2017-12-15 02:00:28 +01:00