catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

88ec5193cb

Merge pull request #510 from ThibG/glitch-soc/merge-upstream ThibG 2018-05-23 19:19:28 +02:00
7719fe0df2

Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search ThibG 2018-05-23 18:54:51 +02:00
e4c82e33e4

Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color ThibG 2018-05-23 18:54:31 +02:00
0553496b76 Change notification cleaning checkbox color (fixes #511) Thibaut Girka 2018-05-23 18:29:15 +02:00
e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-23 16:05:19 +02:00
d8864b9e9d Fix caret position after selected suggestion and media upload (#7595) ThibG 2018-05-23 15:20:15 +02:00
6d99a0b652 Fix tests for invites controller (regression from 4d81809f36) (#7597) Yamagishi Kazutoshi 2018-05-23 13:32:10 +09:00
4d81809f36

Yeah, it was supposed to be #create? Eugen Rochko 2018-05-22 20:05:24 +02:00
7745a22ec7

Bump version to 2.4.0 Eugen Rochko 2018-05-22 19:39:35 +02:00
f8cf85db3b

Remove pointer to light theme until it is more polished (#7594) Eugen Rochko 2018-05-22 19:38:37 +02:00
39d70f375f Remove unneeded code now that attachment URL isn't appended to toots (#7593) ThibG 2018-05-22 19:32:02 +02:00
1a564df586

Do not encode HTML entities in initial Web Push payload body (#7592) Eugen Rochko 2018-05-22 18:12:45 +02:00
4c9d5a500d [WIP] i18n: Update Simplified Chinese translations (#7576) SerCom_KC 2018-05-22 21:26:42 +08:00
12e590edd7 Add tests for report notes controller (#7589) Shuhei Kitagawa 2018-05-22 21:45:10 +09:00
36e47a31e3

Enforce order on authorized applications page (#7587) Eugen Rochko 2018-05-22 14:44:53 +02:00
4eeda67727 Hide section headline for timelines in production (#7590) Yamagishi Kazutoshi 2018-05-22 21:44:32 +09:00
06252ec71e Change column params on pinned timeline (#7581) Yamagishi Kazutoshi 2018-05-22 20:26:06 +09:00
92b09d90c8 Remove outline (#7582) bsky 2018-05-22 20:24:54 +09:00
247f55f673 [Glitch] Fetch relationships for search results in UI Thibaut Girka 2018-05-22 13:05:40 +02:00
a744042cf1 [RU] Added mastodon-light string (#7583) Evgeny Petrov 2018-05-22 12:06:53 +03:00
2289250f69

Merge pull request #503 from glitch-soc/merge-upstream ThibG 2018-05-22 10:02:33 +02:00
6dd676e006

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-21 16:30:24 -05:00
810f92e697 🌍: 🇵🇱⬆️ (#7580) Marcin Mikołajczak 2018-05-21 23:12:35 +02:00
f93806ea55 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-21 18:17:23 +00:00
cc230e5d57

Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes ThibG 2018-05-21 19:20:17 +02:00
d0b2f71501 Fix width only being set for standalone media Thibaut Girka 2018-05-21 18:25:41 +02:00
3ad3cee44c [Glitch] Use real container width in MediaGallery srcSet Thibaut Girka 2018-05-21 17:55:07 +02:00
463078dcc4 [Glitch] Do not override the default push notification settings Thibaut Girka 2018-05-20 11:36:44 +02:00
162f1863a7

Merge pull request #499 from ThibG/glitch-soc/merge-upstream ThibG 2018-05-21 17:51:06 +02:00
5ea643b279

Save onlyMedia prop when pinning column (#7575) Eugen Rochko 2018-05-21 17:49:10 +02:00
40ef46dbef

Display only domain of report account if remote under comment (#7574) Eugen Rochko 2018-05-21 17:33:20 +02:00
a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-21 16:40:02 +02:00
98ecadbf99

Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss ThibG 2018-05-21 16:29:05 +02:00
46061dc041 Add exact attribute to WrappedRoute for community timeline (#7572) Yamagishi Kazutoshi 2018-05-21 23:26:00 +09:00
292c987522

Bump version to 2.4.0rc5 Eugen Rochko 2018-05-21 16:05:31 +02:00
22e067bf5c

Use real container width in MediaGallery srcSet (#7571) Eugen Rochko 2018-05-21 16:04:01 +02:00
32d4372381

Use #any? instead of #exists? when checking media attachments (#7570) Eugen Rochko 2018-05-21 16:01:16 +02:00
e583f110c3

Unescape HTML entities in rich web push notifications in web UI (#7569) Eugen Rochko 2018-05-21 16:00:56 +02:00
c53aacdfa0 Recover glitch-soc specific styles that were removed by accident Thibaut Girka 2018-05-21 15:56:47 +02:00
41b2cfe5b8 i18n: Update Simplified Chinese translations (#7565) SerCom_KC 2018-05-21 19:40:48 +08:00
ea969000a5 Add a light theme (#7027) Sylvhem 2018-05-21 13:40:31 +02:00
7403e5d306 Add media timeline (#6631) Yamagishi Kazutoshi 2018-05-21 19:43:38 +09:00
05f8c375a2

Remove small pagination limit from context API (#7564) Eugen Rochko 2018-05-21 12:43:05 +02:00
9ada532809

Convert rich push notifications to plaintext in webapp (#7563) Eugen Rochko 2018-05-21 03:35:37 +02:00
6eb2bc4348 [i18n] Update for Occitan (#7558) Quentí 2018-05-20 20:26:32 +02:00
779eb07d75

Improve default background of public profile header (#7556) Eugen Rochko 2018-05-20 13:09:28 +02:00
d250e072a2 In footer, replace text "Mastodon" with logo Thibaut Girka 2018-05-20 10:34:20 +02:00
9ed8051961 Add preference to hide following/followers lists Thibaut Girka 2018-05-18 17:24:11 +02:00
50540446f5 [Glitch] Improvements to toots display in admin view Thibaut Girka 2018-05-18 17:09:32 +02:00
2f9bd86f6e

Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed David Yip 2018-05-20 03:03:39 -05:00
56a3d2b64b

Merge pull request #494 from ThibG/glitch-soc/merge-upstream David Yip 2018-05-20 03:01:44 -05:00
0bdda362c9 [RU] Updated strings for 2.4.0 (#7555) Evgeny Petrov 2018-05-20 02:03:24 +03:00
07672e0609 🌍: 🇵🇱⬆️ (#7554) Marcin Mikołajczak 2018-05-20 00:55:56 +02:00
b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2018-05-19 22:41:10 +02:00
6aa5ea1b5d Weblate translations (2018-05-20) (#7552) Yamagishi Kazutoshi 2018-05-20 04:42:21 +09:00
8378b72eba

Ensure push subscription is immediately removed when application is revoked (#7548) Eugen Rochko 2018-05-19 21:05:08 +02:00
5910eb9b61 Add :few keys for sk lang plurals (#7551) Peter 2018-05-19 19:46:18 +01:00
50db106252 Disables autocorrect/autocapitalize on remote username field. (#7549) Ash Furrow 2018-05-19 13:36:23 -04:00
4e1400cecb Cache media only when storage can be freed (#7547) Akihiko Odaki 2018-05-20 02:22:11 +09:00
bcbb6aa46f

Bump version to 2.4.0rc4 Eugen Rochko 2018-05-19 18:38:10 +02:00
1bbe12254d

Improve direct message warning again (#7546) Eugen Rochko 2018-05-19 18:37:33 +02:00
93c66f0c03

In footer, replace text "Mastodon" with logo (#7545) Eugen Rochko 2018-05-19 16:10:55 +02:00
587da93152 checking http status code with range (#7544) takayamaki 2018-05-19 21:47:44 +09:00
4b94e9c65e

Improve payload format of Web Push API now that it's open (#7521) Eugen Rochko 2018-05-19 14:46:47 +02:00
1951ff41b3 Do not override the default push notification settings (#6037) Akihiko Odaki 2018-05-19 21:45:58 +09:00
138512d204 Remove outline (#7543) bsky 2018-05-19 19:16:52 +09:00
7871d29aff

Skip pagination logic for pinned account timelines in reducer (#7540) Eugen Rochko 2018-05-19 02:51:29 +02:00
0b1f88cfd5 Upgrade posix-spawn to master (#7542) MIYAGI Hikaru 2018-05-19 09:20:43 +09:00
97f02f2c08

Do not raise delivery failure on 4xx errors, increase stoplight threshold (#7541) Eugen Rochko 2018-05-19 00:23:19 +02:00
9d6788b30b Prevent click on video from opening detailed toot Thibaut Girka 2018-05-18 17:49:51 +02:00
2154bd1b5a Widen clickable area of toots Thibaut Girka 2018-05-07 17:10:14 +02:00
625c4f36ef

Merge pull request #490 from glitch-soc/merge-upstream ThibG 2018-05-18 17:20:32 +02:00
765fc6700c

ci: Hack around a Travis condition, I guess David Yip 2018-05-18 09:51:00 -05:00
9422b3e0d8

Fix double-encoding of display name in title and e-mails (#7534) Eugen Rochko 2018-05-18 15:56:57 +02:00
399af266e5

ci: Bump .travis.yml to 2.5.1 David Yip 2018-05-18 08:34:35 -05:00
e0eebba461

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-18 07:53:04 -05:00
023dfa119e

Merge pull request #487 from ThibG/glitch-soc/cleanup David Yip 2018-05-18 08:37:31 -05:00
2beeea1e7d Change Japanese translation for privacy.private.short (#7535) Akihiko Odaki 2018-05-18 22:30:45 +09:00
81e3ec4d61

Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji David Yip 2018-05-18 07:55:00 -05:00
5d823ee00a

Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes David Yip 2018-05-18 07:53:53 -05:00
57b503d4ef

Resolve unknown status from Add activity, skip Remove if unknown (#7526) Eugen Rochko 2018-05-18 11:33:56 +02:00
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