Commit Graph

1174 Commits (fbf64105a50edd6ed1ed10b66d7a0dfca5d50756)

Author SHA1 Message Date
Eugen Rochko fbf64105a5 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
2017-04-04 13:01:14 +02:00
Eugen Rochko 5110975df4 Fix #808 - smaller elephant friend PNG for frontpage 2017-04-04 02:03:16 +02:00
Eugen Rochko 7a56845060 Only call regeneration worker after first login after a 14 day break 2017-04-04 02:00:10 +02:00
Eugen Rochko 24793cdbaa Fix ActionController::Parameters in API issue 2017-04-04 01:33:34 +02:00
Eugen Rochko 8eca42b265 Separate background jobs into different queues. ATTENTION: new queue "pull"
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-04 00:53:20 +02:00
Eugen Rochko 8796f7a125 Add check for visibility.nil? even though it can't ever be, to check for race conditions 2017-04-03 22:54:46 +02:00
Eugen Rochko c9ffa7ab1d Add basic logging of who resolved report 2017-04-03 19:35:00 +02:00
Eugen Rochko ceaafb22d3 When taking action on a report (silence/suspend), it dismisses all other
reports for that user automatically
2017-04-03 19:19:54 +02:00
Eugen Rochko 6ebe31e716 Make default admin UI page reports. Add admin UI for creating a domain block 2017-04-03 18:55:06 +02:00
David Baumgold 3e38b3989f GitHub should be capitalized 2017-04-03 11:44:11 -04:00
JantsoP f0be0d36c9 fixed typo 2017-04-03 14:16:03 +02:00
JantsoP 35ad63910d Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP bb8d80f1b0 add finnish translation
add finnish translation
2017-04-03 13:34:26 +02:00
JantsoP 4949cc46d8 add finnish translation
add finnish translation
2017-04-03 13:33:43 +02:00
JantsoP a3e82c4fa5 add finnish language
add finnish language
2017-04-03 13:32:10 +02:00
Eugen a2224bb6ac Merge pull request #764 from ticky/tweak-quick-start-area
Fix the position of the Mastodon mascot in the UI
2017-04-03 12:59:16 +02:00
JantsoP 7227a992fc Create Finnish translation for Mastodon
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
Marvin Kopf 61333ed232 add mute option in status dropdown 2017-04-03 10:44:08 +02:00
Jessica Stokes f7bc9938a8 Fix the position of the Mastodon mascot in the UI
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-03 13:16:14 +10:00
Eugen 8ba7d4ed82 Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen 720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Kazhnuz e6a6c102f6 Add forgotten comma 2017-04-02 23:39:41 +02:00
Damien Erambert 5f0e912d87 Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Kazhnuz 6ac05fc74b Update French Translation 2017-04-02 23:18:01 +02:00
Eugen e3509e02c0 Merge pull request #740 from 0x70b1a5/master
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
Eugen 0335a52e28 Merge pull request #741 from eramdam/feature/improve-french-locales
Improve/add some French locales
2017-04-02 22:22:44 +02:00
Eugen Rochko 4bfabbd5e2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
button would be displayed in account lists for unloaded relationships
2017-04-02 22:02:38 +02:00
Eugen Rochko eb85833dc7 Keep track of which timelines are connected live to avoid redundant
refreshes on navigation
2017-04-02 21:44:06 +02:00
Eugen Rochko 1ee4c6415c Catching rack timeout from rails doesn't work 2017-04-02 21:12:18 +02:00
Tobias Merkle bba468bcca single-quotes 2017-04-02 14:55:13 -04:00
Tobias Merkle 034cfeb1ac remove black border on buttons 2017-04-02 14:54:24 -04:00
Eugen Rochko 00e99e58db Add proper error page for request timeouts 2017-04-02 19:43:44 +02:00
Olivia Mossberg 6e4703703a Merge branch 'master' of github.com:tootsuite/mastodon
It's just an upstream merge
2017-04-02 17:04:31 +02:00
Olivia Mossberg 2d8a0caf98 Fix word-break in account profiles
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-02 16:54:24 +02:00
Eugen Rochko f04816f005 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
2017-04-02 16:45:49 +02:00
Eugen Rochko 4db2e2f4eb Fix issue with feed merge-in code as well 2017-04-02 15:58:25 +02:00
Eugen Rochko 572cf64791 Fix feed regeneration bug 2017-04-02 15:46:31 +02:00
Eugen Rochko 347830262f Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master 2017-04-02 12:36:26 +02:00
Damien Erambert 22fb48ca13 Add fr locale for community_timeline in fr.jsx 2017-04-01 23:45:53 -07:00
Eugen Rochko e407ed24a6 Fix landing page sign up form ignoring username field 2017-04-02 04:13:22 +02:00
Tobias Merkle 8befce32f3 improve video button visibililty 2017-04-01 21:02:30 -04:00
Eugen Rochko 431bfcaad6 Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko d1f8bd2673 Paperclip will complain on its own if this variable is missing 2017-04-01 22:16:26 +02:00
Eugen Rochko b794690bfe Made modal system more generic 2017-04-01 22:11:28 +02:00
Maxime BORGES 9f0d00567b Fix word-break in profile's note on profile page and profile component 2017-04-01 20:17:28 +02:00
Eugen Rochko 348e817d53 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko 3c6e9ee33c Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen Rochko a895f0d448 Rework search 2017-03-31 21:11:09 +02:00
shel 57e3d4c58b Merge branch 'master' into patch-2 2017-03-31 10:34:14 -04:00
Eugen Rochko 7931d5886c Fix web UI profile clickable area overlapping with follow button area 2017-03-31 14:23:44 +02:00