1786 Commits (f5cdea512242abeb4e108d243bf6be317b35a864)

Author SHA1 Message Date
Mingye Wang 3ed219f907 Polish zh-cn js translation (#2090)
8 years ago
Matt Jankowski 55e1503522 Instances list in admin (#2095)
8 years ago
Matt Jankowski 66d8f99a30 Admin reports with accounts (#2092)
8 years ago
Tomohiro Suwa f23281e31e Disable toot button when above 500 characters (#2088)
8 years ago
spf 9783d8b6c0 fix admin input display (#1633)
8 years ago
JP DeVries 7525971561 Moving aria-label to div.column (#1769)
8 years ago
Matt Jankowski 84b5fae8e3 Simplify renders in views (#2084)
8 years ago
ik-fib 23ecc681c4 Add "Mastodon" to user agent (#2073)
8 years ago
Keiji, Yoshimi 82bbf57e7a Translate onboarding dialog to japanese (#2062)
8 years ago
839 e2a1b574ab Avoid dynamic methods due to processing speed (#2080)
8 years ago
Andrey Blinov 880590ad0d Fix header icons in navigation bar (#2081)
8 years ago
Koala Yeung 0a1b024600 Add Occitan (oc) translation (#2077)
8 years ago
Ratmir Karabut 50ed72767d Update Russian translation (#1967)
8 years ago
geta6 75910abd8f Add hasMore field to account timeline (#2066)
8 years ago
Eugen Rochko 42d54dc9ea Adjust visuals of non-autoplaying GIFV
8 years ago
Eugen Rochko 57d784f1e4 Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Matt Jankowski 16d50f60d1 Remove unused methods (#1730)
8 years ago
Eugen Rochko f5cd0b4956 Rename cache key to exclude_account_ids_for:id, adjust formatting
8 years ago
Eugen Rochko 2fd0473aa1 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
8 years ago
Damien Erambert 9cefb5731d Add FR locales to the onboarding modal (#1976)
8 years ago
Mingye Wang 00a85f31ca Add simplified Chinese js translation (#2044)
8 years ago
Matt Jankowski 389f8f8249 Instance helper to replace site title helper (#2038)
8 years ago
jeroenpraat e1e15adf1d Updated, improved and fixed Dutch language strings (#2030)
8 years ago
Matt Jankowski f96f8d0176 Use .presence instead of ternary on site description for og: content (#2033)
8 years ago
Sam Hewitt a05e7582e4 optimized logo (#2020)
8 years ago
Andrey Blinov 7d1e653ec1 Fix import pt_br locale in mastodon.jsx (#2011)
8 years ago
Zac Anger 7b397b1452 Return early from submit if no text. (#1962)
8 years ago
Matt Jankowski cc1361c149 Media controller specs (#2022)
8 years ago
Eugen 15ec4ae07b Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
8 years ago
Eugen e43071a2f9 Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989)
8 years ago
Matt Jankowski 21a767dcfa Improve handling of HTTP_ACCEPT for webfinger (#2008)
8 years ago
Tomohiro Suwa 3399dd7a66 Fix nil query_username (#2013)
8 years ago
alpaca-tc 630de52fdd Required foreign keys (#2003)
8 years ago
Christophe Gesché 4082e1ac7f Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987)
8 years ago
tom 6b8e95ea00 Make contents of boost confirmation dialog scroll (#1710)
8 years ago
Patrick Figel ffb99325ca Add gif auto-play/pause preference
8 years ago
Dale Price f3b86c1bda Add mask-icon.svg (#1572) (#1585)
8 years ago
Hugo Gameiro 6685106daa Add Brazilian Portuguese and fix European Portuguese (#1966)
8 years ago
May Kittens Devour Your Soul 8ad6722eea Create hr.jsx (#1945)
8 years ago
Yuki Nakagawa 548ff54714 Optimize user setting page for mobile browser (#1924)
8 years ago
Yamagishi Kazutoshi 6afe70db95 Add human locales for zh-tw (#1984)
8 years ago
usagi-f b87a08e160 Add function color remaining text (#1980)
8 years ago
anon f8ae12909c Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975)
8 years ago
saturday06 d87ee1167e Assign user locale on signup (#1982)
8 years ago
Keiji, Yoshimi 7a5086729a reduce unneed query when post without attachements. (#1907)
8 years ago
Eugen 1955a3f444 Do not display "reset password" in admin UI for remote accounts (#1960)
8 years ago
Eugen 8ebed7fc68 Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)
8 years ago
Eugen f902a335f9 Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876)
8 years ago
Eugen e4af4898de Add language detection (#1772)
8 years ago
Eugen 6d70a80263 Onboarding modal (#1883)
8 years ago
Matt Jankowski f87b51fda8 I18n health warnings (#1949)
8 years ago
alpaca-tc 19f63ff801 Check @recipient.user at the first (#1939)
8 years ago
Eugen babbb2135e Fix #1813 - Alleviate extra requests when processing mentions (#1938)
8 years ago
Effy Elden acd33101c5 Merge branch 'master' into fix/cache_blocking
8 years ago
Matt Jankowski e0b5a94a4b Clean up check that account needs a webfinger update (#1932)
8 years ago
Matt Jankowski 26ec042f38 Remove trailing whitespace in terms.no.html (#1933)
8 years ago
Matt Jankowski 73b0af5c93 Simplify the og:image and og:description code in stream_entries/show (#1934)
8 years ago
Matt Jankowski 7efde22c3a Use local vars in partials (#1935)
8 years ago
abcang 90760eae4c fix regex filter (#1845)
8 years ago
tackeyy fc34e0e191 Remove .keep in models (#1892)
8 years ago
alpaca-tc de72db99fa Add presence validation to Import (#1928)
8 years ago
mshrtkch 2c329f2b69 Fix translation related to "mute" (#1926)
8 years ago
alpaca-tc 8f8319852c Fixed NoMethodError in UnfollowService (#1918)
8 years ago
Matt Jankowski 75f416a492 Fix yaml issue in ja locale (#1916)
8 years ago
Naouak 24baaa17e8 Syntax error in japanese localisation (#1920)
8 years ago
Erwan Leboucher c99fc08a0d Add missing french translation. (#1906)
8 years ago
Yuki Nakagawa a8f45c0838 Enlarge font size to avoid autozooming of iPhone. (#1911)
8 years ago
新都心(Neet Shin) f2997c9715 Update Japanese Translate (#1903)
8 years ago
Eugen 5d710b1139 Make file attachment on MediaAttachment optional (#1865)
8 years ago
Keiji Yoshimi fd81916e86 cache blockings for reducing queries.
8 years ago
Eugen 8a58942c80 Fix up recovery codes design a little (#1866)
8 years ago
Matt Jankowski 3834e1e69b View spec fix (#1888)
8 years ago
Eugen 95bcbaa434 Fix #1852 - Ensure feeds have valid <title> tags (#1875)
8 years ago
Isabelle Knott 911338bdcc Show error message if video cannot be loaded (#1879)
8 years ago
Eugen e332552816 Indicate when a toot is part of a chain with a "reply all" icon (#1869)
8 years ago
Eugen 0d83569899 Fix cross-origin integrity (#1871)
8 years ago
Eugen 515434ed87 English localization for mention notification was missing (#1867)
8 years ago
Naouak 3d3e32befb Check for a custom css file to help customization of instances (#1368)
8 years ago
alpaca-tc 00392d3c63 ActiveRecord::NotFound is not defined (#1864)
8 years ago
Marcin Cieślak 1c8477eab2 Give SINGLE_USER a chance to register (#1820)
8 years ago
Matt Jankowski 6670e6d33f Add password reset for users from admin accounts area (#1841)
8 years ago
Henry Smith 9d2f55ecc3 Remove isRequired from optional prop (#1843)
8 years ago
Henry Smith b7ec2fd492 Fix function call name typo (#1851)
8 years ago
Matt Jankowski 3b8908c114 About page contact email (#1839)
8 years ago
Alex Dunn 0f889523e4 views/about: use Setting.site_title instead of hardcoding (#1508)
8 years ago
Zac Anger f4045ba3d9 Add eslint-plugin-jsx-a11y (#1651)
8 years ago
Patrick Figel df4ff9a8e1 Add recovery code support for two-factor auth (#1773)
8 years ago
Amakasu Ryoma f0f6a3279a Update ja.jsx (#1822)
8 years ago
Alda Marteau-Hardi bddd36f260 Add a classname to the loading bar (#1826)
8 years ago
Keiji, Yoshimi b857551617 fixed privacy mistake of japanese translation of privacy.change (#1832)
8 years ago
alpaca-tc f9d7ec8971 ActiveRecord::Relation does not respond to `#id` (#1834)
8 years ago
Matt Jankowski 40fd1de488 Account search service refactor (#1791)
8 years ago
ThibG 31f0bcf804 Refresh webfinger (#1323)
8 years ago
Matt Jankowski 09540192c9 Rename admin/accounts_helper to admin/filter_helper (#1816)
8 years ago
Koala Yeung 08059ddda9 jslint: fix jslint warnings (#1704)
8 years ago
Koala Yeung ec9999cdfe Update Traditional Chinese, HK (zh-HK) translation (#1759)
8 years ago
Fjoerfoks 4ba6acd518 Update nl.jxs (#1766)
8 years ago
Ratmir Karabut 5d8d827436 Update Russian translation (#1733)
8 years ago
Matt Jankowski cde1f37d93 Use site title on tags#show page (#1802)
8 years ago
Thor Harald Johansen 4bebeb27d3 More Norwegian translations (#1805)
8 years ago
Joachim Viide ef879a8839 Send initial state in a <script type="application/json"> tag (#1806)
8 years ago
Alex Dunn 0655f16cc1 [css] reduce spacing between text elements on about pages (#1510)
8 years ago
ThibG a9529d3b4b Allow running mastodon on a different domain as the one used for identifying users (#1267)
8 years ago
Patrick Figel fe8dd58bc1 Add list of muted user to UI and Getting Started (#1799)
8 years ago
Matt Jankowski f5cd138323 Improve i18n chooser (#1804)
8 years ago
Luc Didry fa89deb4eb Add title attribute to URLs in statuses (#1755)
8 years ago
Matt Jankowski 26a892dd90 Fix invalid byte sequence issue in nl.jsx (#1751)
8 years ago
Effy Elden 8321884eef Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753)
8 years ago
西小倉宏信 290e8ef854 Remove .keep in models (#1748)
8 years ago
JP DeVries 1467515d3d Use landmark regions on columns (#1732)
8 years ago
Matt Jankowski 8b74aa4217 Admin reports controller improvements (#1714)
8 years ago
maxypy a6807201d2 Implementing Subresource Integrity (#1729)
8 years ago
Eugen Rochko 41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
8 years ago
Eugen c5afe573da Fix drag & drop overlay not appearing on firefox (#1721)
8 years ago
Thomas Citharel c0c56db0fa Translate admin (#1702)
8 years ago
Alyssa Ross 55b56e3f95 terms: remove redundant words (#1578)
8 years ago
R Tucker c4d39b1b3d quick typo fix in en.jsx: Rejec -> Reject (#1701)
8 years ago
Eugen ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)
8 years ago
Eugen 043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700)
8 years ago
INAGAKI Hiroshi 5619099564 translation: Fix comment out issue in en.jsx (#1698)
8 years ago
Koala Yeung ce80d0b0a9 Fix minor jslint issue (#1697)
8 years ago
Eugen Rochko 5f8155482a Add overlay style to buttons, continue video after expanding it
8 years ago
Matteo Aquila efcf9448da Update settings_helper.rb
8 years ago
Eugen Rochko e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
8 years ago
Rachel H 9362700137 Convert emoji shortnames when sending status (#1666)
8 years ago
Koala Yeung 1206627c59 Add Dutch translation (nl) (#1682)
8 years ago
Isabelle Knott edefcfcf42 Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692)
8 years ago
Matt Jankowski b330d1f000 Organize coverage dirs (#1695)
8 years ago
Eugen 1a5a54eb4b Merge branch 'master' into master
8 years ago
Isabelle Knott 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693)
8 years ago
Matt Jankowski 093879c177 Fix language export variables (#1689)
8 years ago
Matteo Aquila 905a4faa1c Update settings_helper.rb
8 years ago
Matteo Aquila 5355b7d930 Update settings_helper.rb
8 years ago
blackle 00cc3066a2 Allow video to be expanded into lightbox
8 years ago
YOSHIOKA Eiichiro a57d30c680 [l10n] ja: update missing Japanese translations (#1687)
8 years ago
Musee U 467d32fce3 [l10n] ja: update missing Japanese translations (#1684)
8 years ago
Hugo Gameiro 282bb55c3c fix Portuguese translation (#1661)
8 years ago
新都心(Neet Shin) 0e4479bb3a Update Japanese translation files (#1640)
8 years ago
Ratmir Karabut af7e880df5 Update Russian translation (#1570)
8 years ago
Svetlozar Todorov aa7bf1515c Fix #624 - Add localization for Bulgarian (#645)
8 years ago
Daijiro Wachi 4f781b17cc Use input type `number` for Two-factor code (#1683)
8 years ago
Matt Jankowski 137100dcf3 Clean up well-known routes/controllers (#1649)
8 years ago
Matt Jankowski 3a9eb81a80 Admin accounts controller cleanup (#1664)
8 years ago
Matt Jankowski 0e39cc6a35 Settings export refactor (#1646)
8 years ago
Koala Yeung faefd8ec8f Update javascript English translation files and some defaultValue (#1676)
8 years ago
Isabelle Knott 96715d9af5 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662)
8 years ago
tom af96e71883 Smoother scrolling on older iOS devices (#1654)
8 years ago
Thor Harald Johansen ccaf3dbc5a Adjustments to the Norwegian translation (#1648)
8 years ago
Isabelle Knott 1ea662963f Use shift+click instead of alt+click to bypass boost dialog (#1638)
8 years ago
Eugen bd834add56 Fix visuals introduced in #1463 (#1634)
8 years ago
lindwurm 9966bd27c2 [l10n] ja: Improve Japanese Translations (#1631)
8 years ago
Isabelle Knott b0ab632531 Fix missing compose box when viewport width is exactly 1024px (#1632)
8 years ago
Knut Erik e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625)
8 years ago
pinfort 38e24a699b fix Japanese translation (#1623)
8 years ago
goofy-bz 9b698bf448 Update fr.jsx (#1551)
8 years ago
Ben Roberts 0254ee9795 significant improvement in microformats markup (#1063)
8 years ago
karlyeurl dab9b5bd3a locale-fr: fix typo (#1603)
8 years ago
Julien Deswaef c4baa9fb6b vector (svg) logo with correct inner shape and colors (#1362)
8 years ago
David Libeau c2a31b8032 Fix target blank on "open_in_web" link (#1612)
8 years ago
Matt Jankowski c44a700252 Quick best practice cleanup of views/helpers (#1546)
8 years ago
Matt Jankowski aa90798386 Webfinger resource to extract username from resource string (#1607)
8 years ago
Rachel H 0930ce5560 Focus textarea when text is inserted (#1320)
8 years ago
Matt Jankowski 7f0a865b05 Allow import/export of mutes list (#1541)
8 years ago
Carlos A. Escobar 3064ef96a1 Added missing Spanish translations strings (#1292)
8 years ago
lindwurm ee69ece7b5 [web] Moving docs link to tootsuite/documentation (#1581)
8 years ago
Thomas Citharel d90d23699c Make Reporting admin section translatable (#1549)
8 years ago
Thor Harald Johansen 1f5ff46fd9 Working translation for Norwegian. (#1611)
8 years ago
Matt Jankowski 13528f50c3 Params compact deprecation warning (#1580)
8 years ago
Matt Jankowski dd1ae3b109 Simplify the way the embed view is created (#1590)
8 years ago
Matt Jankowski b352a8e5d4 Default to json type for webfinger requests (#1583)
8 years ago
Matt Jankowski fd102059aa Clean up stylesheet organization (#1591)
8 years ago
Matt Jankowski 323671a653 Silence more scope order warnings (#1604)
8 years ago
Koala Yeung 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)
8 years ago
Eugen 8ead070b94 Improve emoji picker look (#1493)
8 years ago
Eugen b22b2cbfac Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548)
8 years ago
Matt Jankowski 3ddd936b03 Refactor exports controller (#1567)
8 years ago
Henry Smith 1921c5416b Fix console error when scrolling a column with no scrollable content (#1574)
8 years ago
lindwurm fc47c1d00e [about] Moving docs link to tootsuite/documentation (#1573)
8 years ago
Thomas Citharel 327a6e166f Update french locale (#1525)
8 years ago
pinfort 6f5268b02d Add Japanese translation (#1552)
8 years ago
Matt Jankowski 89e8e110c8 Imports controller errors (#1553)
8 years ago
Eugen Rochko 9f7ea77d0c Merge branch 'master' of github.com:tootsuite/mastodon
8 years ago
Eugen Rochko 960181fd99 Fix look of the modals
8 years ago
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
Komic 47aacb773b Better background-photo.jpeg (#1560)
8 years ago
Matt Jankowski 82d9336114 Increase breakpoint size for bio on account show (#1559)
8 years ago
Matt Jankowski e60286a344 Remove unused methods from StreamEntriesHelper (#1365)
8 years ago
Matt Jankowski 53850bce93 Remove unused AtomBuilderHelper (#1364)
8 years ago
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
8 years ago
blackle f53fb6aa66 Bypass boost confirm modal if alt is pressed
8 years ago
Corey Dutson c9b9225951 Adjust css for user detail page (#1463)
8 years ago
blackle 01e5447e35 Add boost confirm modal
8 years ago
Matt Jankowski 4ada50985a Pagination improvements (#1445)
8 years ago
Eugen 12f72e1740 When avatar/header are GIF, generate static versions (#1428)
8 years ago
Matt Jankowski b57eed4584 Remove order prior to .find_in_batches (#1470)
8 years ago
Matthias Jouan 3fd5385e7b Add username as a title for mentions (#1385)
8 years ago
Eugen 2810013b93 API param to exclude notification types from response (#1341)
8 years ago
Matt Jankowski 0687ab8ae3 Clean up generation of account webfinger string (#1477)
8 years ago
Chris Martin ae57b3a8c5 Add more specific class names to notification divs (#1120)
8 years ago
Rachel H f690320fb9 Keep newlines in xml (#1397)
8 years ago
Stephen Burgess 553170b77a Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
8 years ago
Jessica Stokes 8a6096a3de Allow typing a toot while an image uploads (#1429)
8 years ago
Matt Jankowski d2f6d9b9fb Fix issue with missing emojify class in views (#1455)
8 years ago
Matt Jankowski dbe9f33fdc Admin base controller (#1465)
8 years ago
Corey Dutson 087ca3009b Adjust background of emoji panel (#1461)
8 years ago
Jessica Stokes db7c7d1af1 Improve scrolling behaviour (#1415)
8 years ago
Ram Lmn 42fb4faa0f Fix icon and emoji sizes (#1403)
8 years ago
Ratmir Karabut 9043b32183 Add Russian translation (ru) (#1023)
8 years ago
Jantso Porali e30bbb1cb0 Fix for Import issue from URL (#1416)
8 years ago
Gavin Mogan 8bdf02812c Add search to emoji picker (#1395)
8 years ago
Eugen 93db265be7 Do not store last visited URL from API controllers (#1330)
8 years ago
Eugen c172919745 Fix #1339 - better Atom titles (#1343)
8 years ago
Eugen 15d442cf9d Fix /api/v1/accounts/update_credentials tests (#1357)
8 years ago
Hugo Gameiro 4ea4ef9d0f update portuguese translation (#1280)
8 years ago
ThibG d19ed18388 Get handle from atom feed's author/email field instead of guessing from URL (#1344)
8 years ago
David Authier f0bd439486 Use HTTP Accept-Language to detect locale (#1166)
8 years ago
David Celis d4fe6cd2bf Allow users to update their Account in the API (#1179)
8 years ago
Matt Jankowski ea6c930c04 Helper cleanup (#1348)
8 years ago
StefOfficiel 12e29c9660 Update fr.jsx (#1329)
8 years ago
Olivier Humbert 082bef3027 French translation update (#1271)
8 years ago
Jonathan Klee ba2aea3a80 add empty notifications french translation (#1111)
8 years ago
Matt Jankowski e5282e4ec0 Clean up about page (#1282)
8 years ago
Brian Mock 53eb31f124 Fixes #1311 margin shouldn't stay fixed (#1312)
8 years ago
Matt Jankowski 388ec0d5b6 Search cleanup (#1333)
8 years ago
Rachel H b1881a3d48 Fix nonworking clear notices button (#1316)
8 years ago
Eugen b89f007862 Make public timelines API not require user context/app credentials (#1291)
8 years ago
Eugen 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Pavel Djundik 470eb0042e Improve responsiveness of registration form and closed banner (#1265)
8 years ago
Pavel Djundik fc146a19cc Improve about page responsiveness (#1252)
8 years ago
Eugen 982fef811e Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)
8 years ago
Thomas Citharel 41f8fde83e Update french translation (#1148)
8 years ago
Markus Amalthea Magnuson 157f0a2aa7 Add titles to more icons, and change clear notifications icon. (#1101)
8 years ago
Nicolai von Neudeck c803f5b440 Updated German translation (#1248)
8 years ago
Alda Marteau-Hardi 35eff3f2d0 Add some missing strings to prevent some React warning in the console (#1230)
8 years ago
Matt Jankowski ca44c13455 Use Setting.site_title value for `og:site_name` occurrences (#1194)
8 years ago
Eugen 7d5ea5c170 Merge pull request #1224 from chrisheninger/patch-1
8 years ago
Eugen 33849acfa7 Merge pull request #1218 from R0ckweb/patch-2
8 years ago
Eugen c141f0a886 Merge pull request #1216 from tootsuite/fix-default-locale-regression
8 years ago
Eugen 55d03da303 Merge pull request #1213 from tootsuite/fix-accounts-initial-case
8 years ago
Kurtis Rainbolt-Greene 40703b96fa Merge branch 'master' into fix-default-locale-regression
8 years ago
Kurtis Rainbolt-Greene 1e4453405b Merge branch 'master' into patch-2
8 years ago
Chris Heninger 0ad694f96b Add SVG version of logo to repo
8 years ago
Shel R fef478781d Merge branch 'master' into master
8 years ago
Shel R 9f43e3b428 Merge branch 'master' into patch-4
8 years ago
Yann GUERN 485d75a805 #1141 on remote follow
8 years ago
Eugen Rochko 4b621188ad Fix #1165 - before_action was called before protect_from_forgery
8 years ago
Eugen Rochko b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain
8 years ago
Eugen 1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
8 years ago
Chad Pytel ad5ddd5e95 Use I18n for media attachment validation errors
8 years ago
Joël Quenneville d4c94fa004 DRY up reblog vs original status check
8 years ago
Eugen 4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
8 years ago
Eugen c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception
8 years ago
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale
8 years ago
Eugen Rochko 8a6d8de60a Fix nil#object_type error
8 years ago
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config (#954)
8 years ago
Eugen Rochko e3a3422a65 Allow setting of default language through config
8 years ago
Eugen Rochko 624a9a7136 Re-add forgotten <author> element on standalone <entry>
8 years ago
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140)
8 years ago
Eugen 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
8 years ago
Matt Jankowski 97ae53daa8 Reduce size of background-photo.jpeg
8 years ago
Eugen Rochko 51d7caaf19 Fix wrong pubsub channel on public timelines
8 years ago
Eugen a9c0062e80 Merge pull request #1013 from blackle/master
8 years ago
Eugen Rochko dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
8 years ago
blackle 540d6efe88 Catch more errors in process_follows so it doesn't fail
8 years ago
Eugen Rochko 5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job
8 years ago
André Lewin bf7cefa516 Merge branch 'master' into master
8 years ago
Eugen Rochko 5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast
8 years ago
Eugen c9ebd5d19f Fix wrong variable used in publish channel
8 years ago
Eugen 1b8c244dff Add proper message to PushUpdateWorker, use redis directly
8 years ago
Eugen 3d8b80e1cc Merge branch 'master' into broadcast-to-worker
8 years ago
tom 8989569dd4 Update components.scss
8 years ago
Eugen Rochko 220bc48e8e Only render public payload once in FanOutOnWrite
8 years ago
Eugen Rochko 8530f9413b Replace ActionCable broadcast call with simple redis publish
8 years ago
Eugen 1904a1aa14 Merge pull request #919 from JantsoP/master
8 years ago
Eugen 6b566c6b88 Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
8 years ago
JantsoP 20b53e6add Merge branch 'master' into master
8 years ago
JantsoP b8a867adcc updated translation
8 years ago
Brad Urani 6a1da87cd3 Eliminate unnecessary queries and query clauses with none and all
8 years ago
Kurtis Rainbolt-Greene 22dcadedb4 We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
8 years ago
Kurtis Rainbolt-Greene 7bed4e51db Moved to the worker
8 years ago
Kurtis Rainbolt-Greene 9638894233 Moving in the inline render
8 years ago
Kurtis Rainbolt-Greene 220051b8b2 I don't actually think we need that.
8 years ago
Kurtis Rainbolt-Greene 0069c01285 Moving the queue_at into the worker
8 years ago
Kurtis Rainbolt-Greene dc5704b0b0 This method isn't used anymore
8 years ago
Kurtis Rainbolt-Greene 96ef933820 Replacing the broadcast method with the one defined in the feed manager
8 years ago
Kurtis Rainbolt-Greene 1e96ce378e By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection
8 years ago
Eugen 4c92f15664 Merge branch 'master' into add_more_tests_to_models
8 years ago
Eugen afdcdce551 Merge pull request #839 from SirCmpwn/profile-readability
8 years ago
Drew DeVault c106b6d3e0 Improve readability of text on profiles
8 years ago
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master
8 years ago
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817
8 years ago
Eugen 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements
8 years ago
Eugen 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6
8 years ago
Drew DeVault f7e35d90db Remote follow improvements
8 years ago
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error
8 years ago
Samy KACIMI 79ef756f64 fix rubocop issues
8 years ago
Samy KACIMI 81c76fe375 add more tests to models
8 years ago
axolotl 8736ef50ad Added Esperanto translation inside the javascripts folder
8 years ago
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed
8 years ago
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand
8 years ago
Pete Keen e9a6da6bc7 [#817] Add email whitelist
8 years ago
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
JantsoP 10a8666e04 updated line 28 about GitHub
8 years ago
Eugen 405c495c23 Merge pull request #804 from fhalna/development
8 years ago
Eugen Rochko 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly,
8 years ago
Eugen Rochko b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
8 years ago
Eugen Rochko b21f7c28f6 Move OStatus processing back into default queue
8 years ago
Eugen Rochko ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
8 years ago
halna_Tanaguru 3abb0f7bc7 Merge branch 'master' into development
8 years ago
JantsoP db4a41cf58 Merge branch 'master' into master
8 years ago
JantsoP b8243c1b49 changed line 25 for better translation
8 years ago
Eugen Rochko eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage
8 years ago
Eugen Rochko b510a56c0c Only call regeneration worker after first login after a 14 day break
8 years ago
Eugen Rochko 4c53af64f0 Fix ActionController::Parameters in API issue
8 years ago
Eugen Rochko f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull"
8 years ago
Eugen Rochko 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions
8 years ago
halna_Tanaguru 3f30ae1f97 accessibility fix
8 years ago
axolotl 0700521ef3 added Esperanto (eo)
8 years ago
Eugen Rochko 68f829e11c Add basic logging of who resolved report
8 years ago
Eugen Rochko 71458dc6df When taking action on a report (silence/suspend), it dismisses all other
8 years ago
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block
8 years ago
David Baumgold 5652f00d81 GitHub should be capitalized
8 years ago
JantsoP a229840ffe fixed typo
8 years ago
JantsoP bfa99981e5 Merge branch 'master' into master
8 years ago
JantsoP ae95f35fe6 add finnish translation
8 years ago
JantsoP 22f88b845a add finnish translation
8 years ago
JantsoP eabb86b124 add finnish language
8 years ago
Eugen 5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area
8 years ago
JantsoP 69fc95a2f5 Create Finnish translation for Mastodon
8 years ago
Marvin Kopf 1236a12cae add mute option in status dropdown
8 years ago
Jessica Stokes 2d384850cb Fix the position of the Mastodon mascot in the UI
8 years ago
Eugen d2358aefec Merge branch 'master' into master
8 years ago
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales
8 years ago
Kazhnuz c76d20c2a0 Add forgotten comma
8 years ago
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx
8 years ago
Kazhnuz 633e5ec6f6 Update French Translation
8 years ago
Eugen 09b4b65fde Merge pull request #740 from 0x70b1a5/master
8 years ago
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales
8 years ago
Eugen Rochko a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
8 years ago
Eugen Rochko aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant
8 years ago
Eugen Rochko 2d07cb5771 Catching rack timeout from rails doesn't work
8 years ago
Tobias Merkle f25fc04ea1 single-quotes
8 years ago
Tobias Merkle ca21be3e16 remove black border on buttons
8 years ago
Eugen Rochko 5b12624847 Add proper error page for request timeouts
8 years ago
Olivia Mossberg 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon
8 years ago
Olivia Mossberg f4b5fe9caf Fix word-break in account profiles
8 years ago
Eugen Rochko 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
8 years ago
Eugen Rochko d6b965cf08 Fix issue with feed merge-in code as well
8 years ago
Eugen Rochko e809caa0e1 Fix feed regeneration bug
8 years ago
Eugen Rochko 34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago