catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

dafd7afc5e

Use randomized setTimeout when fallback-polling and re-add since_id (#7522) Eugen Rochko 2018-05-18 02:32:35 +02:00
1e02dc8715

Add preference to hide following/followers lists (#7532) Eugen Rochko 2018-05-18 02:26:51 +02:00
4c0770d6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-18 00:17:23 +00:00
919eef3098 User agent for WebFinger (#7531) MIYAGI Hikaru 2018-05-18 08:47:22 +09:00
07baa1ddb5 [Glitch] Open video modal on public UI Thibaut Girka 2018-05-17 17:10:17 +02:00
94db024e4c [Glitch] Combine similar components into one on public UI Thibaut Girka 2018-05-17 16:53:58 +02:00
dd1d98f9cf [Glitch] Show card modal on public pages Thibaut Girka 2018-05-17 16:45:19 +02:00
52b2f18b15 [Glitch] Enable custom emojis in profiles Thibaut Girka 2018-05-17 15:57:16 +02:00
ca49ad86c6 Remove service worker code that has never been used Thibaut Girka 2018-05-17 15:39:37 +02:00
2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-17 11:17:21 +00:00
7293b9fc61

Ensure unfilled fields are shown when errors are shown (#7523) Eugen Rochko 2018-05-17 13:00:56 +02:00
b48a166c82 Add tests for account_moderation_notes_controller (#7524) Shuhei Kitagawa 2018-05-17 11:26:51 +09:00
dfb6907e08

HTTP signatures spec no longer requires algorithms field (#7525) Eugen Rochko 2018-05-17 04:03:28 +02:00
4bf43e6f3e

Merge pull request #486 from ThibG/glitch-soc/merge-upstream ThibG 2018-05-16 23:10:12 +02:00
78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-16 21:52:38 +02:00
80aad16e10

Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu ThibG 2018-05-16 20:17:08 +02:00
9712d59dda

Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color ThibG 2018-05-16 20:16:59 +02:00
784712791d [Glitch] Reword the direct message warning Thibaut Girka 2018-05-16 19:45:02 +02:00
97c69de416 [Glitch] Feature: Direct message from Statuses Thibaut Girka 2018-04-10 21:38:02 +02:00
fb6de5310d [Glitch] Fix issues with sending direct messages from user profile Thibaut Girka 2018-04-02 17:15:29 +02:00
a5fac975f3 [Glitch] Feature: Direct message from menu Thibaut Girka 2018-03-29 21:13:47 +02:00
eb9c9855ce Fix mastodon-light background color of the composer textarea when posting Thibaut Girka 2018-05-16 19:37:44 +02:00
6bed372ad2 Fix posix-spawn to version 0.3.12 (#7517) MIYAGI Hikaru 2018-05-16 23:52:19 +09:00
5e87c79d25 Russian language for 2.4.0 (#7512) Evgeny Petrov 2018-05-16 17:25:11 +03:00
2b97451168

Fix images resized in browser getting cropped (#7514) Eugen Rochko 2018-05-16 16:24:16 +02:00
4ea376121a French translation tweaks (#7513) Technowix 2018-05-16 16:21:48 +02:00
f60c1d3989 [l10n] Occitan update (#7505) Quentí 2018-05-16 16:18:32 +02:00
dbf65e1b76 Update bot preference text (#7507) nightpool 2018-05-16 08:47:29 -04:00
53c2164e9c Reword the direct message warning (#7420) Sylvhem 2018-05-16 14:47:11 +02:00
77cd6b5096 Do not use permitted_for scope when querying pinned statuses (#7510) Akihiko Odaki 2018-05-16 19:30:14 +09:00
55fd55714a Raise Mastodon::RaceConditionError if Redis lock failed (#7511) Akihiko Odaki 2018-05-16 19:29:45 +09:00
65d6b253fb Let navigator follow redirect instead that handling redirect in fetch (#7500) Akihiko Odaki 2018-05-16 11:59:44 +09:00
17c1a62ec8 Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506) Akihiko Odaki 2018-05-16 04:42:31 +09:00
4511a10e66 Test if navigator.storage.estimate exists before using it (#7504) Akihiko Odaki 2018-05-16 03:15:08 +09:00
918cfd3be6 Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503) Akihiko Odaki 2018-05-16 03:14:30 +09:00
ff84c18e3d 🌍: 🇵🇱⬆️ (#7494) Marcin Mikołajczak 2018-05-15 18:20:40 +02:00
d47091eb97 Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) unarist 2018-05-15 23:03:34 +09:00
1f74c1dbcb Weblate translations 20180515 (#7496) Renato "Lond" Cerqueira 2018-05-15 14:25:07 +02:00
3705cd8322 Clone response before using when caching web page (#7498) Akihiko Odaki 2018-05-15 21:24:50 +09:00
f47f6c3345

Merge pull request #483 from ThibG/glitch-soc/fixes/modal ThibG 2018-05-15 10:52:07 +02:00
dfa60cb0a8 Fix modals testing for props.noEsc (fixes #482) Thibaut Girka 2018-05-15 10:39:12 +02:00
7fe2993b87 Fix account URI when updating ActivityPub account (#7488) Wiktor 2018-05-14 22:56:45 +02:00
939ea456d2

Merge pull request #476 from ThibG/fixes/update-scss David Yip 2018-05-14 15:04:28 -05:00
971218d1dc Change local settings SCSS to be more consistent with modals Thibaut Girka 2018-05-11 16:45:15 +02:00
b5684e9874

Merge pull request #481 from ThibG/glitch-soc/merge David Yip 2018-05-14 14:14:00 -05:00
ba7ee67498 Merge branch 'master' into glitch-soc/merge Thibaut Girka 2018-05-14 20:51:50 +02:00
03b69ebc45 Disallow async function in service worker (#7482) Akihiko Odaki 2018-05-15 02:58:11 +09:00
ed4bae182b Revert index change on statuses for api/v1/accounts account_id statuses (#7484) Akihiko Odaki 2018-05-15 02:56:17 +09:00
8756fd1e82

Bump version to 2.4.0rc3 Eugen Rochko 2018-05-14 17:46:44 +02:00
d8b3f5fb9a Limit environment variables to expose to webpack (#7480) Akihiko Odaki 2018-05-15 00:45:37 +09:00
d75b63e4fb

Bump version to 2.4.0rc2 Eugen Rochko 2018-05-14 14:49:38 +02:00
2226d987f9 Add Slovene language (#7475) Yamagishi Kazutoshi 2018-05-14 19:52:25 +09:00
3793e598d0 Call media.present? because media may be nil (#7474) abcang 2018-05-14 19:51:53 +09:00
42a1231245 Improve index on statuses for api/v1/accounts account_id statuses (#7476) Akihiko Odaki 2018-05-14 19:50:45 +09:00
4665965543

Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme beatrix 2018-05-13 18:57:58 -04:00
416f644505

Fix 404 for GET /api/v1/push/subscription (#7472) Eugen Rochko 2018-05-13 21:45:18 +02:00
97e43ec5f0

Add GET /api/v1/push/subscription REST API (#7471) Eugen Rochko 2018-05-13 21:07:31 +02:00
f31e58af9e

Fix nil error in StatusFilter (#7470) Eugen Rochko 2018-05-13 20:26:30 +02:00
f1ed855f96 Test if navigator.storage is present before using it (#7460) Akihiko Odaki 2018-05-13 20:48:32 +09:00
d9b2f84c92 Open video modal on public UI (#7469) Yamagishi Kazutoshi 2018-05-13 20:48:14 +09:00
f77b11cd10 Update http_parser.rb to head version (#7467) Yamagishi Kazutoshi 2018-05-13 18:32:46 +09:00
685cf5599f

Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape ThibG 2018-05-12 17:53:01 +02:00
cc8d81519e Fix glitch-style bio fields incorrect HTML escaping in public profiles Thibaut Girka 2018-05-12 17:45:30 +02:00
0f2fbf7d05 Improvements to toots display in admin view (#7452) ThibG 2018-05-12 17:44:15 +02:00
7467361d70 Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459) ThibG 2018-05-12 16:48:32 +02:00
f9afd06221 Combine similar components into one on public UI (#7458) Yamagishi Kazutoshi 2018-05-12 22:30:06 +09:00
4d706f9976 Downgrade doorkeeper to version 4.2.6 (#7456) Yamagishi Kazutoshi 2018-05-12 19:08:12 +09:00
bd4decb7db

Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup ThibG 2018-05-11 23:04:12 +02:00
769a48495c Fix root modal's keyup handling (Fixes #478) Thibaut Girka 2018-05-11 22:42:32 +02:00
da8897aaef

Merge pull request #477 from ThibG/glitch-soc/merge ThibG 2018-05-11 20:34:19 +02:00
45fce0e496 Merge branch 'master' into glitch-soc/merge Thibaut Girka 2018-05-11 18:12:42 +02:00
e7ed61917b

Merge pull request #475 from ThibG/fixes/update-scss ThibG 2018-05-11 16:51:14 +02:00
479e5bbd4a

Merge pull request #474 from ThibG/glitch-soc/fixes/html-ified-tooltip ThibG 2018-05-11 16:26:23 +02:00
6284039832 [Glitch] Fix contact info styling on landing page Thibaut Girka 2018-05-11 16:05:47 +02:00
f2e5ed6841 Update SCSS for tables Thibaut Girka 2018-05-11 14:48:19 +02:00
8860f14ef0 Update SCSS for statuses public view Thibaut Girka 2018-05-11 14:43:26 +02:00
4a1040c4cb [Glitch] Adjust RTL styles for landing page Thibaut Girka 2018-05-11 14:34:23 +02:00
e8644f3a4b Update forms SCSS from upstream Thibaut Girka 2018-05-11 14:31:18 +02:00
4cd65fe074 Update SCSS to match “Show card modal on public pages” Thibaut Girka 2018-05-11 14:20:46 +02:00
1a4d735b1d Update SCSS for about/landing page Thibaut Girka 2018-05-11 14:18:52 +02:00
db73c0bc5d Update admin page SCSS from upstream Thibaut Girka 2018-05-11 14:13:59 +02:00
352bae8c3e Update session activation time (fixes #5605) (#7408) ThibG 2018-05-11 13:20:58 +02:00
b241cb2704 Change wording of the “undo” media upload button (fixes #6857) (#7417) ThibG 2018-05-11 13:20:31 +02:00
be7eeb7856 Catch Paperclip processing failures (fixes #6378) (#7439) ThibG 2018-05-11 13:14:50 +02:00
50491e0d92 Add tests for invites controller (#7441) Shuhei Kitagawa 2018-05-11 20:14:33 +09:00
1337ca837b Add CONTINUOUS_INTEGRATION: true to .circleci/config.yml (#7447) Yamagishi Kazutoshi 2018-05-11 18:51:07 +09:00
b4fb766b23

Add REST API for Web Push Notifications subscriptions (#7445) Eugen Rochko 2018-05-11 11:49:12 +02:00
9a794067f7 Weblate translations (2018-05-10) (#7438) Yamagishi Kazutoshi 2018-05-10 21:48:26 +09:00
bd5f57cbc3 Strip tags from og:description on public tag page (#7437) Yamagishi Kazutoshi 2018-05-10 21:38:40 +09:00
0a7e8320b2 Add alternate for RSS (#7436) Yamagishi Kazutoshi 2018-05-10 21:38:19 +09:00
6588f6a0a9 Disable inflate gzip on head method (#7432) Yamagishi Kazutoshi 2018-05-10 21:36:12 +09:00
f6ec8c4821 [Glitch] Use plaintext value for field value tooltips in web UI Thibaut Girka 2018-05-10 13:04:55 +02:00
34142ab29c

Merge pull request #472 from ThibG/glitch-soc/merge ThibG 2018-05-10 00:28:54 +02:00
5d8052e715 Add bot badge to account headers in the WebUI Thibaut Girka 2018-05-09 22:19:10 +02:00
2f01935cba Adapt account fields rendering code in the WebUI to match upstream Thibaut Girka 2018-05-09 23:29:14 +02:00
30bb530c70 Update glitch-soc style to match new bio fields markup Thibaut Girka 2018-05-09 22:11:59 +02:00
a8be40933d Ignore tootsuite-specific theme-related translation strings Thibaut Girka 2018-05-09 20:07:41 +02:00
1c9c0167b7 Merge branch 'master' into glitch-soc/master Thibaut Girka 2018-05-09 17:43:30 +02:00
ac788ad47e Disable simplecov on CircleCI (#7416) Yamagishi Kazutoshi 2018-05-09 23:59:58 +09:00
edf882320a Support gzip encoding on Request (#7425) Yamagishi Kazutoshi 2018-05-09 23:59:39 +09:00
16fee0335f Show card modal on public pages (#7428) Yamagishi Kazutoshi 2018-05-09 23:22:52 +09:00
dc010cc77a 🌍: 🇵🇱⬆️ (#7427) Marcin Mikołajczak 2018-05-09 12:20:49 +02:00
ce35d81db7 Add tests for admin/roles_controller (#7421) Shuhei Kitagawa 2018-05-09 15:41:46 +09:00
35eff337d5 Add tests for admin/invites_controller (#7412) Shuhei Kitagawa 2018-05-09 15:41:26 +09:00
6832110af4 Correct rotate of image using EXIF (#7422) Yamagishi Kazutoshi 2018-05-09 15:41:07 +09:00
d2ee48977c Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424) Yamagishi Kazutoshi 2018-05-09 15:39:08 +09:00
143878d9da

Merge remote-tracking branch 'glitchsoc/master' into gs-master David Yip 2018-05-08 09:43:33 -05:00
40097f438b Multiple Issue templates (#7402) Yamagishi Kazutoshi 2018-05-08 20:35:33 +09:00
e0b1e17bd0 Show media modal on public timeline (#7413) Yamagishi Kazutoshi 2018-05-08 20:33:09 +09:00
01dfd6dbc8 Take the first recognized actor_type. (#7410) Surinna Curtis 2018-05-08 06:30:04 -05:00
b1938d7853 Do not crash in getStatusIds when there is a gap in the timeline (fixes #7400) (#7415) ThibG 2018-05-08 13:28:55 +02:00
f2ff167c1a Add an extra icon to indicate that a status is part of a conversation Spencer Alves 2018-05-07 22:10:34 -07:00
993e68a7dd Fix hashtags not being federated on mentions (fixes #6900) (#7406) ThibG 2018-05-08 03:36:59 +02:00
8f3402b1f0 Port Sylvhem's mastodon-light to glitch flavour Thibaut Girka 2018-05-07 15:09:49 +02:00
919e2098cb

Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements beatrix 2018-05-07 09:45:13 -04:00
2eb924c00c

Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-color beatrix 2018-05-07 09:21:32 -04:00
658ac4396c Hide media in report modal regardless of whether they are marked sensitive Thibaut Girka 2018-05-07 15:00:55 +02:00
6b94237810 [Glitch] Allow report modal to be up to 80% of viewport height Thibaut Girka 2018-05-07 14:59:22 +02:00
7972464e71 [Glitch] Also display replies in report modal Thibaut Girka 2018-05-07 14:55:16 +02:00
6208ea5a53

If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398) Eugen Rochko 2018-05-07 14:49:13 +02:00
ffdb85f859 Fix color of disabled boost buttons (fixes #466) Thibaut Girka 2018-05-07 12:30:55 +02:00
42cd363542

Bot nameplates (#7391) Eugen Rochko 2018-05-07 09:31:07 +02:00
0f0cc3f2eb

Support explicitly supplying language code for status via REST API (#7389) Eugen Rochko 2018-05-07 09:30:53 +02:00
d185f3ddaf

Use plaintext value for field value tooltips in web UI (#7388) Eugen Rochko 2018-05-07 09:30:38 +02:00
db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393) abcang 2018-05-07 16:30:18 +09:00
ea4e243303 Improve OpenStack v3 compatibility (#7392) Hugo Gameiro 2018-05-07 01:28:28 +01:00
95595ccd21

Add Corsican localization (#7390) Eugen Rochko 2018-05-07 01:34:19 +02:00
2e25da4da0

Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes David Yip 2018-05-06 17:39:07 -05:00
a0629c5696

Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colors David Yip 2018-05-06 17:38:58 -05:00
e06fbc4fcf Fixes/rollback scroll changes (#7387) ThibG 2018-05-06 22:26:39 +02:00
de7feea30e Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" Thibaut Girka 2018-05-06 21:50:33 +02:00
4133f70902 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" Thibaut Girka 2018-05-06 21:50:26 +02:00
1adca9b040 Fix glitch high-contrast skin text colors Thibaut Girka 2018-05-06 20:43:54 +02:00
5c7bed6bbc Various improvements to the report UI (#7342) ThibG 2018-05-06 20:38:17 +02:00
331190e5fb

Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility beatrix 2018-05-06 12:12:20 -04:00
92f192e9b1

Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement beatrix 2018-05-06 11:33:09 -04:00
4480cd745f

Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over beatrix 2018-05-06 11:32:56 -04:00
06770656eb

Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables beatrix 2018-05-06 11:32:42 -04:00
e56639258a

Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes beatrix 2018-05-06 11:32:22 -04:00
35a1a3171f

Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items beatrix 2018-05-06 11:32:05 -04:00
e571de29bf

Weblate translations (2018-05-06) (#7381) Yamagishi Kazutoshi 2018-05-06 20:19:56 +09:00
50ed1e83ac

Bump version to 2.4.0rc1 (#7283) Eugen Rochko 2018-05-06 11:50:00 +02:00
61a9018607

Enable custom emojis in profiles (notes, field values, display names) (#7374) Eugen Rochko 2018-05-06 11:48:51 +02:00
65349bc155 Fix color of status icons in glitch-soc high contrast skin Thibaut Girka 2018-05-06 11:31:05 +02:00
af4fb72993

Merge pull request #457 from m4sk1n/glitch-light ThibG 2018-05-06 11:21:26 +02:00
bd10a7e480 Add resend confirmation for admin (#7378) Shuhei Kitagawa 2018-05-06 17:59:03 +09:00
8c35d163a5 Port travis_retry for CI (#7379) Yamagishi Kazutoshi 2018-05-06 17:55:50 +09:00
39efc6d533

Add hint about 7 day cooldown for archive takeout (#7375) Eugen Rochko 2018-05-06 10:53:10 +02:00
b611dbac79

Add contact e-mail hint to 2FA login form (#7376) Eugen Rochko 2018-05-06 10:52:36 +02:00
2f63d52b92

Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371) Eugen Rochko 2018-05-05 23:07:51 +02:00
c7d1a2e400

Improve admin UI for accounts (#7360) Eugen Rochko 2018-05-05 23:06:29 +02:00
660db468c0

Do not count search route as compose being mounted in web UI (#7372) Eugen Rochko 2018-05-05 23:05:43 +02:00
2d065ceaf6 minor fix Thibaut Girka 2018-05-05 22:38:15 +02:00
f7a076eded [Glitch] Add high-contrast theme Thibaut Girka 2018-05-05 21:58:19 +02:00
caebf69e77 Move attachment-lists out of lists.scss Thibaut Girka 2018-05-05 21:06:46 +02:00
bd3b9bf7b9 [Glitch] Fix text color in "show more" link inside boost confirmation modal Thibaut Girka 2018-05-05 21:03:38 +02:00
983328376b Fix link colors in report modal Thibaut Girka 2018-05-05 21:01:15 +02:00
b3a236637e [Glitch] Add color variables of texts for better accesibility Thibaut Girka 2018-05-05 17:58:46 +02:00
8da4bf0f90

4 profile fields max, store only 255 characters per name/value (#7348) Eugen Rochko 2018-05-05 21:11:19 +02:00
80b23a6a85 uniform email rather than e-mail (#7373) Reto Kromer 2018-05-05 21:03:21 +02:00
c947e2e4c5

Fix handling of malformed ActivityPub payloads when URIs are nil (#7370) Eugen Rochko 2018-05-05 18:22:34 +02:00
390cfdef2e [Glitch] Update SCSS of admin and setting pages Thibaut Girka 2018-05-05 17:58:01 +02:00
9edc5cafe4 [Glitch] Improve styling of closed registrations message Thibaut Girka 2018-05-05 17:43:09 +02:00
32974a58dc [Glitch] Do not re-position scroll when loading more (inserting items from below) Thibaut Girka 2018-05-05 17:18:55 +02:00
553cc28240 [Glitch] Prevent timeline from moving when cursor is hovering over it Thibaut Girka 2018-05-05 17:18:25 +02:00
cee157fc19 Improve accessibility of toot dropdown menu Thibaut Girka 2018-05-05 17:11:48 +02:00
bfa5bdde2c [Glitch] Place emoji picker top if it is closer to the bottom of the viewport Thibaut Girka 2018-05-05 16:58:20 +02:00
661f7e6d9d Add tests for admin/custom_emojis_controller (#7350) Shuhei Kitagawa 2018-05-05 22:53:59 +09:00
2ef9d65052

Improve rendering of bio fields (#7353) Eugen Rochko 2018-05-05 00:55:09 +02:00
66359ec522 Fix gap insertion for timeline disconnection (#7363) Akihiko Odaki 2018-05-05 07:54:56 +09:00
c73ce7b695

Store home feeds for 7 days instead of 14 (#7354) Eugen Rochko 2018-05-05 00:54:24 +02:00
ef7d64c801 Dropdowns accessibility (#7318) ThibG 2018-05-04 22:13:26 +02:00
b25278180a Escape metachars in keywords Daggertooth 2018-05-04 14:58:11 -05:00
7600067a30

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-05-04 14:16:30 -05:00
6793bec4c6

Store URIs of follows, follow requests and blocks for ActivityPub (#7160) Eugen Rochko 2018-05-04 21:14:34 +02:00
4c2b522a60 Add a light theme Marcin Mikołajczak 2018-05-04 20:25:58 +02:00
cb62935c0b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-04 18:17:32 +00:00
d1aef17f9a Do not render first page of following and followers collections unless explicitly asked to (#7357) ThibG 2018-05-04 20:17:01 +02:00
2c1f7b2ece

Better pagination for ActivityPub outbox (#7356) Eugen Rochko 2018-05-04 19:19:11 +02:00
b316d373ea

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-05-04 12:16:12 -05:00
2058922cc9

Merge branch 'merge-upstream' into gs-master David Yip 2018-05-04 12:04:55 -05:00
1aa25ee0f5

Merge pull request #456 from m4sk1n/glitch-contrast David Yip 2018-05-04 11:47:49 -05:00
d181aad033 Improve “how to translate” (#7358) Marcin Mikołajczak 2018-05-04 18:37:37 +02:00
00ff8dc00a Add translate guide to CONTRIBUTING.md (#7355) Yamagishi Kazutoshi 2018-05-05 01:01:12 +09:00
a7a61889d7 “Enable” high contrast theme Marcin Mikołajczak 2018-05-04 17:50:11 +02:00
54e80bec73

Remove duplicate posix-spawn entry from Gemfile. David Yip 2018-05-04 10:11:45 -05:00
e41332c37b

Make posix-spawn spec in Gemfile match what's in Gemfile.lock. David Yip 2018-05-04 09:51:18 -05:00
77a92d3260

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-04 09:42:31 -05:00
251bbf9728

Show remote reports in admin UI as coming from domain rather than user (#7347) Eugen Rochko 2018-05-04 13:26:25 +02:00
a78b27c7cc

Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346) Eugen Rochko 2018-05-04 13:22:23 +02:00
c511b0f72a

Merge remote-tracking branch 'glitchsoc/master' into gs-master David Yip 2018-05-04 03:47:35 -05:00
da70208b45

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-04 03:23:57 -05:00
63f848ac8c

Merge pull request #453 from ThibG/glitch-soc/features/short-date David Yip 2018-05-04 03:08:28 -05:00
2d392fb3b8

Remove unused translations. David Yip 2018-05-04 03:01:10 -05:00
106a5d7b83

Remove unnecessary code from MediaAttachment#set_type_and_extension. David Yip 2018-05-04 02:38:04 -05:00
c61ddd8249 Fix 2fa description in Japanese (#7349) Shuhei Kitagawa 2018-05-04 13:58:08 +09:00
c816701550

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-05-03 17:23:44 -05:00
a24605961a Fixes/do not override timestamps (#7336) ThibG 2018-05-03 23:02:46 +02:00
8c601b54cc Do not re-position scroll when loading more (inserting items from below) (#7344) ThibG 2018-05-03 22:32:05 +02:00
a7e71bbd08 Add a missing question mark in rack_attack.rb (#7338) Akihiko Odaki 2018-05-04 01:51:00 +09:00