catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

0fea700c7b Refresh manifest before generate 500.html (#5090) Yamagishi Kazutoshi 2017-09-25 23:58:12 +09:00
2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) Eugen Rochko 2017-09-25 04:04:04 +02:00
b982d549f4 Add strong_migrations gem to warn when creating unsafe migrations (#5078) Eugen Rochko 2017-09-25 02:11:14 +02:00
909a6d4661 Fix streaming API double-JSON-encoding status IDs for deletes (#5069) Eugen Rochko 2017-09-24 15:31:03 +02:00
3f3de38075 OC update: different emoji picker (#5046) (#5077) JeanGauthier 2017-09-24 12:17:47 +02:00
c267acfcf7 Thread toot notification mails by conversation (#5061) ThibG 2017-09-24 11:19:42 +02:00
ab625c57ce Compact status_ids in StatusRelationshipsPresenter (#5073) Daigo 3 Dango 2017-09-23 23:18:32 -10:00
e756c4f5ec Fix media spoiler of DetailedStatus (#5071) abcang 2017-09-24 18:15:11 +09:00
a0bbeafb04 Suppress backtrace when failed to communicate with a remote instance (#5076) Daigo 3 Dango 2017-09-23 23:14:06 -10:00
2f079573ed In detail status view, display attachment uncropped if there's only one (#5054) Eugen Rochko 2017-09-24 05:58:30 +02:00
b2820c3913 Forgotten in #5039, change statuses_tags tag_id to bigint (#5070) Eugen Rochko 2017-09-24 05:58:07 +02:00
adc38078dd Make sure nil IDs to not get cast to empty string in REST API (#5068) Eugen Rochko 2017-09-24 04:09:32 +02:00
dae0af1fd2 Change mobile layout breakpoint from 1024px to 630px (#5063) Eugen Rochko 2017-09-24 01:25:07 +02:00
5b8d0ad71b Dropdown triangles a bit nicer, smoother scrolling on touch (#5062) Eugen Rochko 2017-09-24 00:40:10 +02:00
233258c61b Fix media gallery CSS (#5064) Eugen Rochko 2017-09-24 00:33:26 +02:00
9c8aad612e Require at least 2 characters before showing autosuggestions (#5065) Eugen Rochko 2017-09-24 00:33:17 +02:00
210e6776fc

Fix intl warning with disabled secondary toot btn - Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility Ondřej Hruška 2017-09-23 23:41:25 +02:00
1924a71b5a

Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled Ondřej Hruška 2017-09-23 23:38:24 +02:00
67f8277526 Add secondary toot button (opt-in) (#153) Ondřej Hruška 2017-09-23 23:11:02 +02:00
6dfeb64326 jsx/zh-*: Fix "pin column" for Chinese (#5060) Mingye Wang 2017-09-23 16:47:15 -04:00
427beb4177 i18n: Update Polish translation (#5058) m4sk1n 2017-09-23 22:14:39 +02:00
838f255fc2 Fix overflowing tabs in account__action-bar (#5056) Lynx Kotoura 2017-09-24 04:06:16 +09:00
1e02ba111a Add emoji autosuggest (#5053) Eugen Rochko 2017-09-23 14:47:32 +02:00
66126f3021 Add custom emojis to the emoji picker (#5052) Eugen Rochko 2017-09-23 05:40:28 +02:00
293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051) Eugen Rochko 2017-09-23 01:57:23 +02:00
9c8e602163 Fix custom emojis not detected when used in content warning (#5049) Eugen Rochko 2017-09-23 01:50:17 +02:00
846cd4e838 Switch from EmojiOne to Twemoji, different emoji picker (#5046) Eugen Rochko 2017-09-23 01:41:00 +02:00
169d83f532 Remove "extra clickable spaces" made obsolete by status re-design Ondřej Hruška 2017-09-23 00:33:35 +02:00
31dd261375 applied blackle's fix for gallery offset with full-width media Ondřej Hruška 2017-09-22 21:47:14 +02:00
0de82dd316 Do not filter statuses with unknown languages (#5045) Akihiko Odaki 2017-09-23 02:33:17 +09:00
dcfc9b2204 Fix the migration error when deprecated_preview_cards has been deleted (#5043) nullkal 2017-09-23 02:32:57 +09:00
b01ab55ed8 Fix PropTypes.oneOfType() warning (#5041) Nolan Lawson 2017-09-22 08:50:29 -07:00
dd4ef69839 Hardcode IdToBigints migration columns (#5039) aschmitz 2017-09-22 06:20:04 -05:00
d4f80824f7 Document REDIS_NAMESPACE (#5038) Nolan Lawson 2017-09-21 21:44:39 -07:00
034fab39ab Make dropdowns render into portal, expand animation (#5018) Eugen Rochko 2017-09-22 04:59:17 +02:00
0df6442636 Use passive listener in privacy_dropdown.js (#5037) Nolan Lawson 2017-09-21 19:59:01 -07:00
245816ab27 Eliminate re-renders for intersection_observer_article.js (#5036) Nolan Lawson 2017-09-21 19:58:33 -07:00
c2b479efec Long display names now ellipsis properly kibigo! 2017-09-21 16:55:32 -07:00
a94dc21c79 Styling fixes for header redesign kibigo! 2017-09-21 16:43:01 -07:00
9512db920c Merge pull request #148 from glitch-soc/better-header David Yip 2017-09-21 16:11:03 -05:00
c89cce0219 autoscroll emoji suggestions box Ondřej Hruška 2017-09-21 15:31:24 +02:00
63819c848d fix : mobile style of /about/more (#5034) syui 2017-09-21 21:30:21 +09:00
fa3587645d Merge pull request #149 from glitch-soc/mojon-suggest beatrix 2017-09-20 23:02:23 -04:00
a9abe89093 Fix shortname problem in emojify() (regression from #5016) (#5032) MIYAGI Hikaru 2017-09-21 01:47:16 +00:00
9ed51cecd0 Fixed notification appearance kibigo! 2017-09-20 14:51:45 -07:00
514edd3c23 fulltext mojo suggestions Ondřej Hruška 2017-09-20 22:13:09 +02:00
a3760b7729 TURBO shortcode search Ondřej Hruška 2017-09-20 21:57:33 +02:00
cbf00168f1 add scrollbar to mojon suggestions list when too long Ondřej Hruška 2017-09-20 21:53:08 +02:00
4f9a493d9d cache allShortcodes Ondřej Hruška 2017-09-20 21:39:22 +02:00
8c0733a14e typo in comment Ondřej Hruška 2017-09-20 21:28:44 +02:00
36a35be2ad Appease Travis Ondřej Hruška 2017-09-20 20:34:11 +02:00
3783062450 Emoji and Hashtag autocomplete Ondřej Hruška 2017-09-20 20:21:09 +02:00
798b0fc5af Reduce wasted renders for column_loading.js (#5021) Nolan Lawson 2017-09-20 10:58:44 -07:00
8fcfcddc8f Fix theme translations alphabetically (#5031) Lynx Kotoura 2017-09-21 02:41:35 +09:00
d68df88d4e Disable private status federation over OStatus (#5027) Eugen Rochko 2017-09-20 19:08:20 +02:00
c8580eb806 Use file extensions in addition to MIME types for file picker (#5029) unarist 2017-09-21 02:07:23 +09:00
f41e70ca38 Better Japanese translations (#5030) Lynx Kotoura 2017-09-21 01:56:28 +09:00
7b8ecde32d Add Japanese translations for multiple themes, custom emoji (#5026) mayaeh 2017-09-20 23:09:57 +09:00
8cb4561145 Remove unnecessary css property (#5025) TomoyaShibata 2017-09-20 22:26:22 +09:00
1607bb445a l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023) JeanGauthier 2017-09-20 15:00:54 +02:00
33c39784e4 Add japanese translations for custom emoji. (#5007) mayaeh 2017-09-20 21:57:59 +09:00
669fe9ee06 Change IDs to strings rather than numbers in API JSON output (#5019) aschmitz 2017-09-20 07:53:48 -05:00
15c9c2fd7e Pinned toots; embeds kibigo! 2017-09-20 02:50:53 -07:00
227dbb6adb Added GIF hover-to-play support kibigo! 2017-09-20 02:19:36 -07:00
769f62d96f Improvements to status headers kibigo! 2017-09-20 01:57:08 -07:00
003bfd094e Fixed disabled boost SVG (#106) kibigo! 2017-09-20 00:40:54 -07:00
fae8dce738 Fixed #133 (only parse links in status text) kibigo! 2017-09-20 00:20:11 -07:00
b35406b700 Fix custom emojis with non-1:1 aspect ratio being stretched (#5017) Eugen Rochko 2017-09-20 03:38:38 +02:00
8e33fc29d7 redo #4500 with customEmojis (#5016) MIYAGI Hikaru 2017-09-19 21:27:29 +00:00
1de6c52545 i18n: Update Polish translation (#5015) m4sk1n 2017-09-19 23:25:17 +02:00
34fa305a00 Fix race condition when processing incoming OStatus messages (#5013) ThibG 2017-09-19 21:44:18 +02:00
bb4d005a83 Introduce OStatus::TagManager (#5008) Akihiko Odaki 2017-09-20 01:08:08 +09:00
df1ce2350c Fix non-local statuses are html_encoded in public_page. (#5012) Naoki Kosaka 2017-09-20 00:55:48 +09:00
e5c65b3067 Set touchstart listener to 'passive', remove 'once' (#5011) Nolan Lawson 2017-09-19 08:00:29 -07:00
7d16bb379d Use OrderedCollectionPage to return followers/following list (#4949) nullkal 2017-09-19 23:37:06 +09:00
0401a24558 Add support for multiple themes (#4959) Andrew 2017-09-19 07:36:23 -07:00
4aea3f88a6 Hide sensitive image in default on the public pages (#5009) unarist 2017-09-19 23:03:45 +09:00
41e6c8b151 Fix incomplete account records being read (#4998) Eugen Rochko 2017-09-19 06:53:16 +02:00
813e650729 Remove ubuntu-toolchain-r-test (#5005) Akihiko Odaki 2017-09-19 12:06:27 +09:00
1664e52cbb Fix custom emojis index (#5006) Yamagishi Kazutoshi 2017-09-19 12:06:13 +09:00
dce869dfc7 Define emoji context for ActivityPub (#5004) Eugen Rochko 2017-09-19 05:05:48 +02:00
09a94b575e Admin interface for listing, adding and removing custom emojis (#5002) Eugen Rochko 2017-09-19 03:52:38 +02:00
d43944143a Run i18n-tasks normalize (#5003) Eugen Rochko 2017-09-19 03:27:08 +02:00
81cec35dbf Custom emoji (#4988) Eugen Rochko 2017-09-19 02:42:40 +02:00
c155d843f4 A few updates to the Spanish translation and some typos fixing (#4997) BruWalfas 2017-09-18 19:47:48 -03:00
3d640dc8ac Add will-change to improve scrolling perf (#5001) Nolan Lawson 2017-09-18 14:29:15 -07:00
6db034a866 Re-allow underscore on valid_url_path_ending_chars (#4999) unarist 2017-09-19 04:25:40 +09:00
17bf3363ac Add published property to ActivityPub activity for reblogs (#5000) unarist 2017-09-19 03:30:11 +09:00
dcf1139ebd Do not add image size without meta to OGP (regression from #4901) (#4995) Yamagishi Kazutoshi 2017-09-18 22:00:29 +09:00
9619b7f727 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) Akihiko Odaki 2017-09-18 21:59:57 +09:00
66be6475b6 Bump ruby version to 2.4.2 (#4958) Daigo 3 Dango 2017-09-17 16:55:57 -10:00
9e0985d9e4 Add strip_insignificant_zeros: true option to number_to_human (#4993) Yamagishi Kazutoshi 2017-09-18 11:55:23 +09:00
cf14f4945a Some improvements in the Spanish translation (#4991) febrezo 2017-09-18 04:52:34 +02:00
4c14ff659b Oauth code in input form and add description message (#4986) Lynx Kotoura 2017-09-17 22:23:44 +09:00
dd6f9a1b82 Validate uri presence for remote status (#4985) unarist 2017-09-17 22:21:57 +09:00
3f07f1b2b1 Raise an error on getting activity uri for remote status (#4984) unarist 2017-09-17 20:51:34 +09:00
44245926f1 Fix cancellation of scroll to the right (#4978) abcang 2017-09-17 18:59:23 +09:00
8811778b55 Randomize sidekiq-scheduler cron schedule (#4980) Patrick Figel 2017-09-17 11:58:20 +02:00
1eab53ee10 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979) unarist 2017-09-17 18:54:23 +09:00
7be3131240 So Spanish. Much changes. Wow. (#4976) BruWalfas 2017-09-17 06:16:43 -03:00
198a9a4fa4 Remove local_only scope in Status (#4977) Akihiko Odaki 2017-09-17 12:29:43 +09:00
ec36df97c4 Escape URL parts on formatting local status (#4975) unarist 2017-09-17 04:33:52 +09:00
c8969dca35 Minor Chinese check & jsx addition (#4973) Mingye Wang 2017-09-16 12:48:38 -04:00
b0487488a7 Re-center hidden media text vertical Surinna Curtis 2017-09-16 11:44:17 -05:00
1e3b1d7211 Adjust landing pages 2 (#4967) Lynx Kotoura 2017-09-17 01:39:12 +09:00
f5d6bdd9c0 Merge pull request #147 from yipdw/sync/upstream David Yip 2017-09-16 11:37:53 -05:00
0698c610a6 Fix an error in ReplyDistributionWorker when replied status was deleted (#4974) unarist 2017-09-17 01:18:00 +09:00
ad8e856a5b Fix error when following locked accounts (#4896) Eugen Rochko 2017-09-11 23:50:37 +02:00
629fae8b3b correct URL pattern used in text length counter in WebUI (#4968) ふぁぼ原 2017-09-16 22:01:15 +09:00
c30e6433de Fix AP serialization error when thread is missing (#4970) unarist 2017-09-16 22:00:36 +09:00
cea5597722 Fix hasSize condition in secSet and sizes. (#4969) Naoki Kosaka 2017-09-16 22:00:01 +09:00
48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966) Akihiko Odaki 2017-09-16 21:59:41 +09:00
efec507230 Bump to 1.6.1 Eugen Rochko 2017-09-16 03:08:29 +02:00
54edb4b853 When accessing uncached media attachment, redownload it (#4955) Eugen Rochko 2017-09-16 03:01:45 +02:00
6c81f9d6e5 Fix invisible load more button (#4962) unarist 2017-09-16 07:32:43 +09:00
472df24579 When web UI URL used while logged out, redirect to static page (#4954) Eugen Rochko 2017-09-15 00:57:08 +02:00
0d1215e82f Remove redundant width/height values from SVGs to fix Safari bug (#4956) Eugen Rochko 2017-09-15 00:51:00 +02:00
e77cc032c2 l10n: PT-BR translation updated (#4953) Anna e só 2017-09-14 19:02:38 -03:00
67559361e8 Add scheduled worker to purge old user IPs (#4951) sdukhovni 2017-09-14 16:26:38 -04:00
4a73615193 Fix race condition when receiving an ActivityPub Create multiple times (#4930) ThibG 2017-09-14 22:26:22 +02:00
bdcc9e2ceb Add missing Japanese translations (#4947) Yamagishi Kazutoshi 2017-09-15 01:03:34 +09:00
3816943e6b Enable to recognize most kinds of characters as URL paths (#4941) ふぁぼ原 2017-09-15 01:03:20 +09:00
b39d512ade l10n: update Persian translation (#4946) Masoud Abkenar 2017-09-14 17:13:38 +02:00
04046a4983 Fix #4908 - Do not keep remote file names, generate random (#4934) Eugen Rochko 2017-09-14 16:41:59 +02:00
a4c500176b Include requested URL into the message on network errors (#4945) unarist 2017-09-14 23:12:50 +09:00
1aad015bbb Revert unique retry job (#4937) abcang 2017-09-14 22:12:43 +09:00
94fba44eec i18n: Update Polish translation (#4942) m4sk1n 2017-09-14 14:58:48 +02:00
721460a59b Another Dutch language update (#4944) Jeroen 2017-09-14 14:52:47 +02:00
7ebd6ed03c Apply white-space: nowrap to account relationships icons Surinna Curtis 2017-09-14 07:37:39 -05:00
45b595cdca Add Japanese translate for #4911 (#4943) Naf 2017-09-14 18:20:04 +09:00
aad3df6afc l10n update OC/FR video redesign (#4938) Quent-in 2017-09-14 09:32:14 +02:00
59936b7a98 Tweak title text for mute notifications toggle to be clearer Surinna Curtis 2017-09-13 22:54:14 -05:00
fd9a171129 fix typos in the migration Surinna Curtis 2017-09-13 22:35:48 -05:00
6ba35630bc Add migration to default Mute#hide_notifications? to true Surinna Curtis 2017-09-13 22:26:43 -05:00
1023f52eaa Add Japanese translate for #4913 (#4936) N氏 2017-09-14 12:25:18 +09:00
79d8911116 Fixed a typo that was breaking the account mute API endpoint Surinna Curtis 2017-09-13 21:04:05 -05:00
d880b3182b minor code style fixes oops Surinna Curtis 2017-09-13 20:44:38 -05:00
f9d7b8a94f Refactor handling of default params for muting to make code cleaner Surinna Curtis 2017-09-13 18:32:10 -05:00
211f0a9513 add an explanatory comment to AccountInteractions Surinna Curtis 2017-09-13 17:42:52 -05:00
4a527154b7 fix a missing import Surinna Curtis 2017-09-09 07:36:23 -05:00
df71eadaae In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. Surinna Curtis 2017-09-09 07:26:32 -05:00
323d437a09 satisfy eslint Surinna Curtis 2017-09-09 05:25:33 -05:00
3278c08c29 make the hide/unhide notifications buttons work Surinna Curtis 2017-09-09 05:16:27 -05:00
0284fd723b Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint Surinna Curtis 2017-09-09 05:16:06 -05:00
0e0703dbd8 Show whether muted users' notifications are muted in account lists Surinna Curtis 2017-09-09 05:06:50 -05:00
7dbcc7ed3d Expose whether a mute hides notifications in the api/v1/relationships endpoint Surinna Curtis 2017-09-09 05:05:43 -05:00
83b3a0389c Add more specs for the /api/v1/mutes/details endpoint Surinna Curtis 2017-09-02 13:19:19 -05:00
af2d793398 Define a serializer for /api/v1/mutes/details Surinna Curtis 2017-09-02 13:10:10 -05:00
70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes. Surinna Curtis 2017-09-02 12:24:58 -05:00
30b5254a5d Put the label for the hide notifications checkbox in a label element. Surinna Curtis 2017-08-31 20:59:47 -05:00
0a207be99d add trailing newlines to files for Pork :) Surinna Curtis 2017-08-06 20:15:44 -03:00
500c465226 specs for MuteService notifications params Surinna Curtis 2017-08-06 20:13:12 -03:00
2ea9b164d3 Satisfy eslint. Surinna Curtis 2017-08-06 20:00:38 -03:00
b1576c52df Convert profile header mute to use mute modal Surinna Curtis 2017-08-06 19:43:58 -03:00
4612f7caea Break out a separate mute modal with a hide-notifications checkbox. Surinna Curtis 2017-08-06 19:36:04 -03:00
0c547faf92 Less gross passing of notifications flag Surinna Curtis 2017-07-28 00:12:34 -05:00
eaaf2170fe API support for muting notifications (and specs) Surinna Curtis 2017-07-27 23:31:39 -05:00
6f7d00bfdd Add support for muting notifications in MuteService Surinna Curtis 2017-07-27 23:28:57 -05:00
5c2e1869f0 specs testing that hide_notifications in mutes actually hides notifications Surinna Curtis 2017-07-27 09:08:45 -05:00
0f2af2a974 Add specs for how mute! interacts with muting_notifications? Surinna Curtis 2017-07-27 09:00:29 -05:00
27f8d7069b block notifications in notify_service from hard muted accounts Surinna Curtis 2017-07-27 07:52:45 -05:00
44207b6af6 Add muting_notifications? and a notifications argument to mute! Surinna Curtis 2017-07-17 21:10:37 -05:00
27e55da853 Add a hide_notifications column to mutes Surinna Curtis 2017-07-16 16:10:34 -05:00
596dab06e9 Support OpenGraph video embeds (#4897) Eugen Rochko 2017-09-14 04:11:36 +02:00
4f0597d579 Give video player fluid max-width (#4935) Eugen Rochko 2017-09-14 04:03:00 +02:00
2bbf987a0a Redesign video player (#4911) Eugen Rochko 2017-09-14 03:39:10 +02:00
af00220d79 Fix refollowing (#4931) ThibG 2017-09-14 00:05:25 +02:00
9239e4ce4d Uploads for admin site settings (#4913) Eugen Rochko 2017-09-14 00:04:30 +02:00
06f26e09b4 i18n: Update Polish translation (#4929) m4sk1n 2017-09-13 20:57:33 +02:00
331263270b Updating Dutch translation (#4927) Jeroen 2017-09-13 16:12:29 +02:00
283a5ec1a4 fix share intent. (#4926) MitarashiDango 2017-09-13 22:20:03 +09:00
550ff677da Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904) ThibG 2017-09-13 14:22:16 +02:00
da77f65c46 Add instance search feature (#4925) nullkal 2017-09-13 19:30:07 +09:00
9e2ff3ef71 Make instance names in into links to user list in the instance (#4924) nullkal 2017-09-13 18:34:07 +09:00
b9d241c6f5 Fix #4917 - Add missing suspend checks (#4921) Eugen Rochko 2017-09-13 11:05:02 +02:00
56af04dbb4 Fix #4918 - Limit pinned toots to 5 (#4923) Eugen Rochko 2017-09-13 11:04:32 +02:00
60944d5dca Fix height cache (#4909) abcang 2017-09-13 17:24:33 +09:00
081f907f90 Specify libicu explicitly in Aptfile (#4920) Daigo 3 Dango 2017-09-12 21:30:13 -10:00
f29918e707 [WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907) ThibG 2017-09-12 23:10:40 +02:00
af10c9fbff Add section for protocol specific information on the admin page (#4910) unarist 2017-09-13 06:06:10 +09:00
8f8e677630 Clean up and improve generated OpenGraph tags (#4901) Eugen Rochko 2017-09-12 05:39:38 +02:00
4931eac280 Fix nil error for old toots that don't have a conversation (#4900) Eugen Rochko 2017-09-12 00:57:18 +02:00
881856553e Fix #4894 - Merge context hash into final JSON hash after key transform (#4898) Eugen Rochko 2017-09-12 00:16:18 +02:00
0a6b098668 Fix count numbers from ActivityPub not being saved (#4899) Eugen Rochko 2017-09-12 00:16:03 +02:00
0ef9d45d05 Fix error when following locked accounts (#4896) Eugen Rochko 2017-09-11 23:50:37 +02:00
a6a206ef85 Bump puma from 3.9.1 to 3.10.0 (#4879) Grey Baker 2017-09-11 22:43:19 +01:00
bbff144004 Bump rails from 5.1.3 to 5.1.4 (#4875) Grey Baker 2017-09-11 22:03:14 +01:00
47d48fed8d Reset preview image if avatar/header image selection was cancelled (#4893) unarist 2017-09-11 23:19:54 +09:00
3018043fc2 Add OpenStack Keystone V3 support (#4889) Patrick Figel 2017-09-11 15:11:13 +02:00
3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream Surinna Curtis 2017-09-10 19:43:52 -05:00
c2bee07dbc l10n: Full PT-BR translation (#4882) Anna e só 2017-09-10 20:40:29 -03:00
a345479de2 l10n: update Persian translation (#4880) Masoud Abkenar 2017-09-11 01:35:27 +02:00
29c44fa5fa Remove unused imports Surinna Curtis 2017-09-10 16:00:26 -05:00
7a9c7d4e0b Merge pull request #143 from yipdw/sync/upstream Surinna Curtis 2017-09-10 14:10:30 -05:00
932571fa22 Merge tag 'v1.6.0' into sync/upstream David Yip 2017-09-10 13:04:27 -05:00
c9df53044a Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4 beatrix 2017-09-10 13:34:14 -04:00
08f00df94b i18n: Update Polish translation (#4881) m4sk1n 2017-09-10 17:25:39 +02:00
ab71cf4593 Bump to 1.6.0 Eugen Rochko 2017-09-10 15:10:03 +02:00
c450ddb613 Fix POST /api/v1/follows error when already following (#4878) Eugen Rochko 2017-09-10 15:09:06 +02:00
15b886a6f0 Fix Japanese translation (#4876) yoshipc 2017-09-10 20:34:15 +09:00