1562 Commits (57bec53f1ce3dbc6ed89dfedb4e3f5723e99f685)

Author SHA1 Message Date
Rachel H a6515aeea8 Convert emoji shortnames when sending status (#1666)
8 years ago
Koala Yeung ff826c68eb Add Dutch translation (nl) (#1682)
8 years ago
Isabelle Knott 5c3705f4f7 Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692)
8 years ago
Matt Jankowski 49c3000d62 Organize coverage dirs (#1695)
8 years ago
Eugen e02486edab Merge branch 'master' into master
8 years ago
Isabelle Knott 79cefa3739 Do not show media attachment as og:image if it was marked as NSFW (#1693)
8 years ago
Matt Jankowski 38c0a6fee2 Fix language export variables (#1689)
8 years ago
Matteo Aquila e891a97787 Update settings_helper.rb
8 years ago
Matteo Aquila 3ace439512 Update settings_helper.rb
8 years ago
blackle 924a6d7cd8 Allow video to be expanded into lightbox
8 years ago
YOSHIOKA Eiichiro c8af1e96a5 [l10n] ja: update missing Japanese translations (#1687)
8 years ago
Musee U a3019ede5a [l10n] ja: update missing Japanese translations (#1684)
8 years ago
Hugo Gameiro 990bbacb93 fix Portuguese translation (#1661)
8 years ago
新都心(Neet Shin) 67ed9d8f18 Update Japanese translation files (#1640)
8 years ago
Ratmir Karabut 5a7354ef00 Update Russian translation (#1570)
8 years ago
Svetlozar Todorov 651b89199a Fix #624 - Add localization for Bulgarian (#645)
8 years ago
Daijiro Wachi 16204ba91f Use input type `number` for Two-factor code (#1683)
8 years ago
Matt Jankowski d8789124ae Clean up well-known routes/controllers (#1649)
8 years ago
Matt Jankowski 26ea2f70bd Admin accounts controller cleanup (#1664)
8 years ago
Matt Jankowski 0a6cfca260 Settings export refactor (#1646)
8 years ago
Koala Yeung 94ff16be71 Update javascript English translation files and some defaultValue (#1676)
8 years ago
Isabelle Knott 68e1307371 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662)
8 years ago
tom 168265c708 Smoother scrolling on older iOS devices (#1654)
8 years ago
Thor Harald Johansen d898b8d958 Adjustments to the Norwegian translation (#1648)
8 years ago
Isabelle Knott 36ba70310a Use shift+click instead of alt+click to bypass boost dialog (#1638)
8 years ago
Eugen 389c300c1f Fix visuals introduced in #1463 (#1634)
8 years ago
lindwurm caddfb64aa [l10n] ja: Improve Japanese Translations (#1631)
8 years ago
Isabelle Knott 8df158aa6f Fix missing compose box when viewport width is exactly 1024px (#1632)
8 years ago
Knut Erik 3689d4aa7b Added norwegian version of terms of service and privacy policy (#1625)
8 years ago
pinfort 6ffc89a2e7 fix Japanese translation (#1623)
8 years ago
goofy-bz 2622c76077 Update fr.jsx (#1551)
8 years ago
Ben Roberts 462e956164 significant improvement in microformats markup (#1063)
8 years ago
karlyeurl 9cc96682c3 locale-fr: fix typo (#1603)
8 years ago
Julien Deswaef 91bd681b51 vector (svg) logo with correct inner shape and colors (#1362)
8 years ago
David Libeau c5ce944e25 Fix target blank on "open_in_web" link (#1612)
8 years ago
Matt Jankowski d1ebb63c54 Quick best practice cleanup of views/helpers (#1546)
8 years ago
Matt Jankowski 9d1d8797fd Webfinger resource to extract username from resource string (#1607)
8 years ago
Rachel H bb25c503bd Focus textarea when text is inserted (#1320)
8 years ago
Matt Jankowski bf7306636e Allow import/export of mutes list (#1541)
8 years ago
Carlos A. Escobar 7fd5075806 Added missing Spanish translations strings (#1292)
8 years ago
lindwurm 0b383153f5 [web] Moving docs link to tootsuite/documentation (#1581)
8 years ago
Thomas Citharel cd2324b07b Make Reporting admin section translatable (#1549)
8 years ago
Thor Harald Johansen b2c1df5c20 Working translation for Norwegian. (#1611)
8 years ago
Matt Jankowski f0b4b72c1c Params compact deprecation warning (#1580)
8 years ago
Matt Jankowski ca70fe5ae7 Simplify the way the embed view is created (#1590)
8 years ago
Matt Jankowski c27253cbb6 Default to json type for webfinger requests (#1583)
8 years ago
Matt Jankowski 7e6a5dbe08 Clean up stylesheet organization (#1591)
8 years ago
Matt Jankowski 8ed4ecb7e4 Silence more scope order warnings (#1604)
8 years ago
Koala Yeung a3bfac26fb Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)
8 years ago
Eugen 138b35027c Improve emoji picker look (#1493)
8 years ago
Eugen 5122f9ab3b Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548)
8 years ago
Matt Jankowski 63e46e27f0 Refactor exports controller (#1567)
8 years ago
Henry Smith f2a3340fec Fix console error when scrolling a column with no scrollable content (#1574)
8 years ago
lindwurm 25c5f86211 [about] Moving docs link to tootsuite/documentation (#1573)
8 years ago
Thomas Citharel c471e5c694 Update french locale (#1525)
8 years ago
pinfort 601d93bfc3 Add Japanese translation (#1552)
8 years ago
Matt Jankowski db979ebcee Imports controller errors (#1553)
8 years ago
Eugen Rochko 7dc25b762d Merge branch 'master' of github.com:tootsuite/mastodon
8 years ago
Eugen Rochko 0a25971d6d Fix look of the modals
8 years ago
Eugen Rochko b440b2a9ee Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
Komic b108632f6a Better background-photo.jpeg (#1560)
8 years ago
Matt Jankowski bcdcb0fb7b Increase breakpoint size for bio on account show (#1559)
8 years ago
Matt Jankowski a9886524d9 Remove unused methods from StreamEntriesHelper (#1365)
8 years ago
Matt Jankowski 9a30c564b6 Remove unused AtomBuilderHelper (#1364)
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
blackle e68cde9255 Bypass boost confirm modal if alt is pressed
8 years ago
Corey Dutson 7a4cb10e6b Adjust css for user detail page (#1463)
8 years ago
blackle 3f5290bdb2 Add boost confirm modal
8 years ago
Matt Jankowski fcec9fcd99 Pagination improvements (#1445)
8 years ago
Eugen e0977567e7 When avatar/header are GIF, generate static versions (#1428)
8 years ago
Matt Jankowski 43143fb22e Remove order prior to .find_in_batches (#1470)
8 years ago
Matthias Jouan 2be9b85ed6 Add username as a title for mentions (#1385)
8 years ago
Eugen 68f3ce7d0c API param to exclude notification types from response (#1341)
8 years ago
Matt Jankowski 874a240a58 Clean up generation of account webfinger string (#1477)
8 years ago
Chris Martin fa5165e874 Add more specific class names to notification divs (#1120)
8 years ago
Rachel H b07990c94f Keep newlines in xml (#1397)
8 years ago
Stephen Burgess 17ce0b4141 Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
8 years ago
Jessica Stokes adee97cb6e Allow typing a toot while an image uploads (#1429)
8 years ago
Matt Jankowski 37c9ee5a10 Fix issue with missing emojify class in views (#1455)
8 years ago
Matt Jankowski 8d0a4b7200 Admin base controller (#1465)
8 years ago
Corey Dutson 9fe4ae3372 Adjust background of emoji panel (#1461)
8 years ago
Jessica Stokes 6907c06ce3 Improve scrolling behaviour (#1415)
8 years ago
Ram Lmn 306bdff915 Fix icon and emoji sizes (#1403)
8 years ago
Ratmir Karabut ac50bab158 Add Russian translation (ru) (#1023)
8 years ago
Jantso Porali 4def9924d7 Fix for Import issue from URL (#1416)
8 years ago
Gavin Mogan e331f52be2 Add search to emoji picker (#1395)
8 years ago
Eugen 5c57f15503 Do not store last visited URL from API controllers (#1330)
8 years ago
Eugen d30a82a22f Fix #1339 - better Atom titles (#1343)
8 years ago
Eugen 47a3702db4 Fix /api/v1/accounts/update_credentials tests (#1357)
8 years ago
Hugo Gameiro eb6c3fdca9 update portuguese translation (#1280)
8 years ago
ThibG e326eb53dd Get handle from atom feed's author/email field instead of guessing from URL (#1344)
8 years ago
David Authier 9252133084 Use HTTP Accept-Language to detect locale (#1166)
8 years ago
David Celis 6e0b4032b3 Allow users to update their Account in the API (#1179)
8 years ago
Matt Jankowski 3b3671c797 Helper cleanup (#1348)
8 years ago
StefOfficiel 288bbf6ffb Update fr.jsx (#1329)
8 years ago
Olivier Humbert d473a092e3 French translation update (#1271)
8 years ago
Jonathan Klee dd12af9fd9 add empty notifications french translation (#1111)
8 years ago
Matt Jankowski 41b79ae693 Clean up about page (#1282)
8 years ago
Brian Mock b92480bc01 Fixes #1311 margin shouldn't stay fixed (#1312)
8 years ago
Matt Jankowski 641e809eaf Search cleanup (#1333)
8 years ago
Rachel H ff75c89585 Fix nonworking clear notices button (#1316)
8 years ago
Eugen 3047a8da74 Make public timelines API not require user context/app credentials (#1291)
8 years ago
Eugen b532134503 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Pavel Djundik ae422d872c Improve responsiveness of registration form and closed banner (#1265)
8 years ago
Pavel Djundik 72a526010d Improve about page responsiveness (#1252)
8 years ago
Eugen 697e4da6cb Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)
8 years ago
Thomas Citharel a9863c1708 Update french translation (#1148)
8 years ago
Markus Amalthea Magnuson 41aa5b0d58 Add titles to more icons, and change clear notifications icon. (#1101)
8 years ago
Nicolai von Neudeck e885aeed92 Updated German translation (#1248)
8 years ago
Alda Marteau-Hardi f34314fd52 Add some missing strings to prevent some React warning in the console (#1230)
8 years ago
Matt Jankowski 0d9a420c1a Use Setting.site_title value for `og:site_name` occurrences (#1194)
8 years ago
Eugen cc6ec445b8 Merge pull request #1224 from chrisheninger/patch-1
8 years ago
Eugen 0b8bd5a9ce Merge pull request #1218 from R0ckweb/patch-2
8 years ago
Eugen eb68ecc9d7 Merge pull request #1216 from tootsuite/fix-default-locale-regression
8 years ago
Eugen 22eff0449f Merge pull request #1213 from tootsuite/fix-accounts-initial-case
8 years ago
Kurtis Rainbolt-Greene b399356fa5 Merge branch 'master' into fix-default-locale-regression
8 years ago
Kurtis Rainbolt-Greene a1ab8bff51 Merge branch 'master' into patch-2
8 years ago
Chris Heninger 68e2f357c0 Add SVG version of logo to repo
8 years ago
Shel R 3b9a56d4b3 Merge branch 'master' into master
8 years ago
Shel R 17c734b017 Merge branch 'master' into patch-4
8 years ago
Yann GUERN 33b00dd70f #1141 on remote follow
8 years ago
Eugen Rochko 07f42f0824 Fix #1165 - before_action was called before protect_from_forgery
8 years ago
Eugen Rochko 81b7c81200 Fix #801 - Respect webfinger's canonical response of username/domain
8 years ago
Eugen c3f2975fa4 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
8 years ago
Chad Pytel 1a82d2bde6 Use I18n for media attachment validation errors
8 years ago
Joël Quenneville 8a67fb5eca DRY up reblog vs original status check
8 years ago
Eugen 2f1bd3462e Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
8 years ago
Eugen 7215446774 Merge branch 'master' into fix-object-type-nil-exception
8 years ago
Eugen ef7240169a Merge branch 'master' into feature-customized-default-locale
8 years ago
Eugen Rochko eaa0b8e669 Fix nil#object_type error
8 years ago
Jantso Porali fb0ce9d38d Update Finnish translations, add sample Minio config (#954)
8 years ago
Eugen Rochko 9bb84337a7 Allow setting of default language through config
8 years ago
Eugen Rochko a1c63cb01d Re-add forgotten <author> element on standalone <entry>
8 years ago
Eugen 1781fcaea4 Force UTF8 encoding on generated XML (#1140)
8 years ago
Eugen 24c77e57b2 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
8 years ago
Matt Jankowski 7411863663 Reduce size of background-photo.jpeg
8 years ago
Eugen Rochko 0db2a0c7c4 Fix wrong pubsub channel on public timelines
8 years ago
Eugen f10668da16 Merge pull request #1013 from blackle/master
8 years ago
Eugen Rochko fb6459d303 Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
8 years ago
blackle 70f485a9e7 Catch more errors in process_follows so it doesn't fail
8 years ago
Eugen Rochko cd68e54a7d Split SalmonWorker into smaller parts, move profile updating into another job
8 years ago
André Lewin 783de713cd Merge branch 'master' into master
8 years ago
Eugen Rochko 5189ce9cd1 Replace calls to FeedManager#inline_render and #broadcast
8 years ago
Eugen 54329947ab Fix wrong variable used in publish channel
8 years ago
Eugen b9ddfff8f6 Add proper message to PushUpdateWorker, use redis directly
8 years ago
Eugen d67e1fe44d Merge branch 'master' into broadcast-to-worker
8 years ago
tom ea10ddedaa Update components.scss
8 years ago
Eugen Rochko 8f38353c4d Only render public payload once in FanOutOnWrite
8 years ago
Eugen Rochko 3cc7378924 Replace ActionCable broadcast call with simple redis publish
8 years ago
Eugen cae7d221c7 Merge pull request #919 from JantsoP/master
8 years ago
Eugen 39e5ecb61d Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
8 years ago
JantsoP c0295924bc Merge branch 'master' into master
8 years ago
JantsoP 6a33b51fd2 updated translation
8 years ago
Brad Urani 522410589e Eliminate unnecessary queries and query clauses with none and all
8 years ago
Kurtis Rainbolt-Greene 192f855952 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 9b8f587c8d Moved to the worker
8 years ago
Kurtis Rainbolt-Greene bea03b4553 Moving in the inline render
8 years ago
Kurtis Rainbolt-Greene dd66bce930 I don't actually think we need that.
8 years ago
Kurtis Rainbolt-Greene 7d887cea4b Moving the queue_at into the worker
8 years ago
Kurtis Rainbolt-Greene 9e58c2b0e3 This method isn't used anymore
8 years ago
Kurtis Rainbolt-Greene 4f2985cddc Replacing the broadcast method with the one defined in the feed manager
8 years ago
Kurtis Rainbolt-Greene de1bb4bd56 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 744456cb55 Merge branch 'master' into add_more_tests_to_models
8 years ago
Eugen bb582ac177 Merge pull request #839 from SirCmpwn/profile-readability
8 years ago
Drew DeVault 27e4759c00 Improve readability of text on profiles
8 years ago
Eugen c571ed77d7 Merge pull request #818 from JantsoP/master
8 years ago
Eugen 4751381a24 Merge pull request #852 from peterkeen/email-whitelist-817
8 years ago
Eugen a8468cc6cc Merge pull request #898 from SirCmpwn/remote-follow-improvements
8 years ago
Eugen 6a8bb89f80 Merge pull request #858 from krainboltgreene/patch-6
8 years ago
Drew DeVault 932b0b2f1f Remote follow improvements
8 years ago
Eugen Rochko d2b7daf6bb Remove PuSH subscriptions when delivery is answered with a 4xx error
8 years ago
Samy KACIMI 06424fd912 fix rubocop issues
8 years ago
Samy KACIMI 9f80b2dd4e add more tests to models
8 years ago
axolotl f6463e595f Added Esperanto translation inside the javascripts folder
8 years ago
Eugen Rochko fa2a1af90a Spawn FeedInsertWorker to deliver status into personal feed
8 years ago
Kurtis Rainbolt-Greene 8dace45447 Use active record shorthand
8 years ago
Pete Keen f28fcf9080 [#817] Add email whitelist
8 years ago
Eugen Rochko 353a30810c New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
JantsoP c3db103305 updated line 28 about GitHub
8 years ago
Eugen 79828478c6 Merge pull request #804 from fhalna/development
8 years ago
Eugen Rochko e60c473917 Reduce number of items in feeds, optimize regeneration worker slightly,
8 years ago
Eugen Rochko 9123aca6df Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
8 years ago
Eugen Rochko 1484df2db5 Move OStatus processing back into default queue
8 years ago
Eugen Rochko fbf64105a5 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
8 years ago
halna_Tanaguru c7e14e496b Merge branch 'master' into development
8 years ago
JantsoP 0c0e1c2519 Merge branch 'master' into master
8 years ago
JantsoP fc2b031506 changed line 25 for better translation
8 years ago
Eugen Rochko 5110975df4 Fix #808 - smaller elephant friend PNG for frontpage
8 years ago
Eugen Rochko 7a56845060 Only call regeneration worker after first login after a 14 day break
8 years ago
Eugen Rochko 24793cdbaa Fix ActionController::Parameters in API issue
8 years ago
Eugen Rochko 8eca42b265 Separate background jobs into different queues. ATTENTION: new queue "pull"
8 years ago
Eugen Rochko 8796f7a125 Add check for visibility.nil? even though it can't ever be, to check for race conditions
8 years ago
halna_Tanaguru 4833f53a37 accessibility fix
8 years ago
axolotl d6d192c914 added Esperanto (eo)
8 years ago
Eugen Rochko c9ffa7ab1d Add basic logging of who resolved report
8 years ago
Eugen Rochko ceaafb22d3 When taking action on a report (silence/suspend), it dismisses all other
8 years ago
Eugen Rochko 6ebe31e716 Make default admin UI page reports. Add admin UI for creating a domain block
8 years ago
David Baumgold 3e38b3989f GitHub should be capitalized
8 years ago
JantsoP f0be0d36c9 fixed typo
8 years ago
JantsoP 35ad63910d Merge branch 'master' into master
8 years ago
JantsoP bb8d80f1b0 add finnish translation
8 years ago
JantsoP 4949cc46d8 add finnish translation
8 years ago
JantsoP a3e82c4fa5 add finnish language
8 years ago
Eugen a2224bb6ac Merge pull request #764 from ticky/tweak-quick-start-area
8 years ago
JantsoP 7227a992fc Create Finnish translation for Mastodon
8 years ago
Marvin Kopf 61333ed232 add mute option in status dropdown
8 years ago
Jessica Stokes f7bc9938a8 Fix the position of the Mastodon mascot in the UI
8 years ago
Eugen 8ba7d4ed82 Merge branch 'master' into master
8 years ago
Eugen 720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales
8 years ago
Kazhnuz e6a6c102f6 Add forgotten comma
8 years ago
Damien Erambert 5f0e912d87 Add more lcoales in fr.jsx
8 years ago
Kazhnuz 6ac05fc74b Update French Translation
8 years ago
Eugen e3509e02c0 Merge pull request #740 from 0x70b1a5/master
8 years ago
Eugen 0335a52e28 Merge pull request #741 from eramdam/feature/improve-french-locales
8 years ago
Eugen Rochko 4bfabbd5e2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
8 years ago
Eugen Rochko eb85833dc7 Keep track of which timelines are connected live to avoid redundant
8 years ago
Eugen Rochko 1ee4c6415c Catching rack timeout from rails doesn't work
8 years ago
Tobias Merkle bba468bcca single-quotes
8 years ago
Tobias Merkle 034cfeb1ac remove black border on buttons
8 years ago
Eugen Rochko 00e99e58db Add proper error page for request timeouts
8 years ago
Olivia Mossberg 6e4703703a Merge branch 'master' of github.com:tootsuite/mastodon
8 years ago
Olivia Mossberg 2d8a0caf98 Fix word-break in account profiles
8 years ago
Eugen Rochko f04816f005 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
8 years ago
Eugen Rochko 4db2e2f4eb Fix issue with feed merge-in code as well
8 years ago
Eugen Rochko 572cf64791 Fix feed regeneration bug
8 years ago
Eugen Rochko 347830262f Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago
Damien Erambert 22fb48ca13 Add fr locale for community_timeline in fr.jsx
8 years ago
Eugen Rochko e407ed24a6 Fix landing page sign up form ignoring username field
8 years ago
Tobias Merkle 8befce32f3 improve video button visibililty
8 years ago
Eugen Rochko 431bfcaad6 Fix broken reference
8 years ago
Eugen Rochko d1f8bd2673 Paperclip will complain on its own if this variable is missing
8 years ago
Eugen Rochko b794690bfe Made modal system more generic
8 years ago
Maxime BORGES 9f0d00567b Fix word-break in profile's note on profile page and profile component
8 years ago
Eugen Rochko 348e817d53 Improve mobile tabs a little
8 years ago
Eugen Rochko 3c6e9ee33c Fix reworked search
8 years ago
Eugen Rochko a895f0d448 Rework search
8 years ago
shel 57e3d4c58b Merge branch 'master' into patch-2
8 years ago
Eugen Rochko 7931d5886c Fix web UI profile clickable area overlapping with follow button area
8 years ago
Eugen Rochko 355b9278d5 Fix some views still not using counter caches
8 years ago
Eugen Rochko be9accbacc Fix #700 - hide spoilers on static pages
8 years ago
Eugen Rochko 9169326960 :active and :focus states same as :hover for buttons
8 years ago
Eugen Rochko bbc3a36c82 Fix drag & drop overlay flickering
8 years ago
Eugen Rochko 244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko 96e58cf289 Add counter caches for a large performance increase on API requests
8 years ago
Eugen Rochko cdbfbbc691 Improve emojis - use SVGs where possible
8 years ago
Eugen Rochko 8c97719fbc Hide drag & drop area on drop event regardless of success
8 years ago
Eugen Rochko 4ef48bcc42 Fix #408 - link @ names in bios
8 years ago
Eugen Rochko a4ce8b09fb Fix #690 - Webfinger should handle new shortform profile URLs now (nice)
8 years ago
shel 728174500e Clarify post privacy warning
8 years ago
Eugen Rochko 02e2336daa Add tooltip to privacy dropdown
8 years ago