about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-04-04updated line 28 about GitHubJantsoP
2017-04-04Merge branch 'master' into masterJantsoP
2017-04-04changed line 25 for better translationJantsoP
2017-04-04Fix #808 - smaller elephant friend PNG for frontpageEugen Rochko
2017-04-04Only call regeneration worker after first login after a 14 day breakEugen Rochko
2017-04-04Fix ActionController::Parameters in API issueEugen Rochko
2017-04-04Separate background jobs into different queues. ATTENTION: new queue "pull"Eugen Rochko
must be added to the Sidekiq invokation in your systemd file The pull queue will handle link crawling, thread resolving, and OStatus processing. Such tasks are more likely to hang for a longer time (due to network requests) so it is more sensible to not make the "in-house" tasks wait for them.
2017-04-03Add check for visibility.nil? even though it can't ever be, to check for ↵Eugen Rochko
race conditions
2017-04-03Add basic logging of who resolved reportEugen Rochko
2017-04-03When taking action on a report (silence/suspend), it dismisses all otherEugen Rochko
reports for that user automatically
2017-04-03Make default admin UI page reports. Add admin UI for creating a domain blockEugen Rochko
2017-04-03GitHub should be capitalizedDavid Baumgold
2017-04-03fixed typoJantsoP
2017-04-03Merge branch 'master' into masterJantsoP
2017-04-03add finnish translationJantsoP
add finnish translation
2017-04-03add finnish translationJantsoP
add finnish translation
2017-04-03add finnish languageJantsoP
add finnish language
2017-04-03Merge pull request #764 from ticky/tweak-quick-start-areaEugen
Fix the position of the Mastodon mascot in the UI
2017-04-03Create Finnish translation for MastodonJantsoP
Create Finnish translation for Mastodon
2017-04-03add mute option in status dropdownMarvin Kopf
2017-04-03Fix the position of the Mastodon mascot in the UIJessica Stokes
The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour! It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
2017-04-03Merge branch 'master' into masterEugen
2017-04-03Merge pull request #746 from eramdam/feature/improve-french-localesEugen
Feature/improve french locales (again)
2017-04-02Add forgotten commaKazhnuz
2017-04-02Add more lcoales in fr.jsxDamien Erambert
2017-04-02Update French TranslationKazhnuz
2017-04-02Merge pull request #740 from 0x70b1a5/masterEugen
remove black border on video mute/spoiler buttons
2017-04-02Merge pull request #741 from eramdam/feature/improve-french-localesEugen
Improve/add some French locales
2017-04-02Avoid re-loading already loaded relationships. Also fixes issue where wrongEugen Rochko
button would be displayed in account lists for unloaded relationships
2017-04-02Keep track of which timelines are connected live to avoid redundantEugen Rochko
refreshes on navigation
2017-04-02Catching rack timeout from rails doesn't workEugen Rochko
2017-04-02single-quotesTobias Merkle
2017-04-02remove black border on buttonsTobias Merkle
2017-04-02Add proper error page for request timeoutsEugen Rochko
2017-04-02Merge branch 'master' of github.com:tootsuite/mastodonOlivia Mossberg
It's just an upstream merge
2017-04-02Fix word-break in account profilesOlivia Mossberg
word-break:break-all is a surefire way to break things. It should be set to normal. This merge just set it back to what it should be. Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected errors.
2017-04-02Fix wording "show reblogs" -> "show boosts", order reports chronologically inEugen Rochko
admin UI
2017-04-02Fix issue with feed merge-in code as wellEugen Rochko
2017-04-02Fix feed regeneration bugEugen Rochko
2017-04-02Merge branch 'master' of https://github.com/maximeborges/mastodon into ↵Eugen Rochko
maximeborges-master
2017-04-01Add fr locale for community_timeline in fr.jsxDamien Erambert
2017-04-02Fix landing page sign up form ignoring username fieldEugen Rochko
2017-04-01improve video button visibililtyTobias Merkle
2017-04-01Fix broken referenceEugen Rochko
2017-04-01Paperclip will complain on its own if this variable is missingEugen Rochko
2017-04-01Made modal system more genericEugen Rochko
2017-04-01Fix word-break in profile's note on profile page and profile componentMaxime BORGES
2017-04-01Improve mobile tabs a littleEugen Rochko
2017-03-31Fix reworked searchEugen Rochko
2017-03-31Rework searchEugen Rochko