Commit graph

8033 commits

Author SHA1 Message Date
dependabot[bot]
c439d53587 Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-22 12:47:14 +01:00
dependabot[bot]
3c952f58a9 Bump capybara from 3.11.0 to 3.11.1 (#9305)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.0...3.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-22 12:46:57 +01:00
ThibG
6d38e81021 Include replies to list owner and replies to list members in list statuses (#9324) 2018-11-21 17:02:58 +01:00
Eugen Rochko
0ebb6c1480 Revert connect timeout from 1s to 10s (#9319)
The failure rate in Sidekiq is too high
2018-11-21 17:00:56 +01:00
Renato "Lond" Cerqueira
55aa92b893 Touch account on successful response, change char shown when culled (#9293)
Just the color is not enough change since not everyone uses colored
terminals.
Touching the account makes it so that the account is not in the
threshold window in case of running again
2018-11-20 22:25:32 +01:00
Alexandre Alapetite
d51ed0a0a1 WebSub: ATOM before RSS (#9302)
Hello,
The ATOM feed contains the hub declaration for WebSub, but the RSS
version does not.
RSS/ATOM readers will typically pick whichever version comes first, and
will thus not see the WebSub feature.
I therefore suggest putting the ATOM version first, as it is more
feature-rich than its RSS counterpart is.

Clients not compatible with ATOM would not pick it anyway due to the
different type attribute.

A more complicated alternative would be to declare the WebSub feature in
the RSS version as well, using something like the following code, and
ensuring that clients subscribed to the RSS version would receive PuSH
updates just like those subscribed to the ATOM version.

````xml
<rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0"
xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<atom:link rel="self" type="application/rss+xml"
href="https://diaspodon.fr/users/test.rss"/>
<atom:link rel="hub" href="https://diaspodon.fr/api/push"/>
</channel>
</rss>
```
2018-11-20 22:25:04 +01:00
Dan Hunsaker
4774f84eb0 Update Nginx config for Nanobox apps (#9310)
The Nanobox files have gotten out of sync, a touch, with what Masto needs for Nginx settings. This PR updates them accordingly.
2018-11-20 22:24:35 +01:00
Eugen Rochko
a217abb71c Cast status_count to integer (#9314)
It is returned as a double because the sum is now over bigint columns

Fix #9312
2018-11-20 02:52:52 +01:00
Thibaut Girka
e7c0ad6ac4 Move URLs to backend in their own file 2018-11-19 15:56:38 +01:00
James Kiesel
b874d9dac7 Simplify hashtag query service, perf increase for 'any' tags (#9298) 2018-11-19 12:49:50 +01:00
Eugen Rochko
7c9a655933 Fix filter ID not being a string in REST API (#9303) 2018-11-19 10:37:57 +01:00
Eugen Rochko
62c0e112ea Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
James Kiesel
98c9ad366b Deep compare tags for hashtag column reload (#9297)
* Deep compare tags for hashtag column reload

* Don't use global lodash
2018-11-17 11:07:48 +01:00
Eugen Rochko
4ec133ef93 Prevent multiple handlers for Delete of Actor from running (#9292) 2018-11-16 19:46:23 +01:00
Eugen Rochko
76a0c28687 Sort self-replies to the top of the thread (#9296)
Fix #6463
2018-11-16 19:34:10 +01:00
Thibaut Girka
7a1ec950a8 Fix composer not displaying on iPad 2018-11-16 15:04:32 +01:00
Eugen Rochko
7a939f7cfc Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
dependabot[bot]
1d97ce7dd8 Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.1 to 1.24.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-16 11:19:09 +01:00
mayaeh
6d9f63dba6 Change the password form order (#9267)
* Change order of password.

* Update Japanese translation for "Show thread".

* Separate the translation PR.
2018-11-16 11:18:43 +01:00
mayaeh
214aab8715 Fix "tootctl media remove" can't count the file size (#9288)
* Fixed an issue where "tootctl media remove" can not count the file size.

* Fixed the problem pointed out by codeclimate.
2018-11-16 09:47:40 +01:00
mayaeh
d8ea8569c0 Update Japanese translation for "Show thread". (#9287) 2018-11-16 11:16:10 +09:00
Thibaut Girka
ca163ec35d In detailed status view, take displayMedia setting into account when changing media
Fixes #819
2018-11-15 16:38:50 +01:00
dependabot[bot]
82b626a3eb Bump capybara from 3.10.1 to 3.11.0 (#9285)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.10.1...3.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-15 14:49:06 +09:00
Thibaut Girka
10ec788f5d Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
Thibaut Girka
ca7f2284cd Add field to serialized local-only statuses 2018-11-13 18:55:57 +01:00
Thibaut Girka
c2c8cc7fc3 Exclude local-only toots from atom feeds 2018-11-13 18:55:57 +01:00
ThibG
26e37971ab Merge pull request #817 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-13 18:48:07 +01:00
Thibaut Girka
a1848008a9 [Glitch] Fix race condition when interacting with deleted toots
Port 7083838a54 to glitch-soc
2018-11-13 16:30:07 +01:00
Thibaut Girka
b3553f992d Merge branch 'master' into glitch-soc/merge-upstream 2018-11-13 16:28:07 +01:00
Thibaut Girka
b22501154e [Glitch] Prepend account header even when status list is empty
Partially port bc464619f3
2018-11-13 15:54:04 +01:00
Thibaut Girka
07e0f1023d [Glitch] Fix loading indicator inconsistency
Port 0562e258b3 to glitch-soc
2018-11-13 15:54:04 +01:00
Thibaut Girka
f40a7b2616 [Glitch] Use local instead of global loading indicator for timelines, account timelines
Port 9a32abcbac to glitch-soc
2018-11-13 15:54:04 +01:00
ThibG
7083838a54 Fix race condition causing shallow status with only a "favourited" attribute (#9272)
Fixes #9231
2018-11-13 14:58:14 +01:00
Eugen Rochko
c735638483 Fix null error introduced in #9270 (#9275) 2018-11-12 22:07:31 +01:00
ThibG
df154d2ffa Perform deep comparison for card data when receiving new props (#9270)
Fixes #9226
2018-11-12 18:17:50 +01:00
ThibG
d2e5b51060 Merge pull request #813 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-12 16:00:16 +01:00
Thibaut Girka
b7ef203fd6 Tighten CSP a bit 2018-11-12 15:43:02 +01:00
dependabot[bot]
a82563aebd Bump parallel_tests from 2.26.2 to 2.27.0 (#9263)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:50:48 +01:00
dependabot[bot]
acdc5d658b Bump thor from 0.20.0 to 0.20.3 (#9266)
Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3.
- [Release notes](https://github.com/wycats/thor/releases)
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:50:21 +01:00
dependabot[bot]
a4be0edb1a Bump oj from 3.7.0 to 3.7.1 (#9265)
Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:50:12 +01:00
dependabot[bot]
aa2edec6c3 Bump bullet from 5.8.1 to 5.9.0 (#9264)
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12 12:49:51 +01:00
Les Orchard
4e067b1bd0 Only consider mouse move in scrolling on item insertion (#9262)
Fixes #9259
2018-11-11 23:20:20 +01:00
mayaeh
04f0b63c59 i18n: Add ja translations (#9261)
* Run yarn manage:translations

* Add Japanese translations.
2018-11-11 18:57:16 +01:00
ThibG
b6e377a340 Fix emoji update date processing (#9255) 2018-11-10 23:59:51 +01:00
ThibG
49889c0b8b Check that twitter:player is valid before using it (#9254)
Fixes #9251
2018-11-10 20:42:04 +01:00
Thibaut Girka
e5fd4939ff Merge branch 'master' into glitch-soc/merge-upstream 2018-11-10 17:57:19 +01:00
Eugen Rochko
0562e258b3 Fix loading indicator inconsistency (#9252)
* Use global loading indicator when loading more items

* Use local loading indicator for notifications

And remove global loading indicator for initial custom emojis load
2018-11-10 15:04:13 +01:00
ThibG
c81ac519ef Merge pull request #806 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-11-09 22:29:52 +01:00
Thibaut Girka
de57627588 [Glitch] Remove unused computation of reblog references from updateTimeline 2018-11-09 21:57:56 +01:00
Thibaut Girka
d457964527 [Glitch] Don't remove originals of boosted toots from timeline
Port 019c39bf1d to glitch-soc
2018-11-09 21:57:56 +01:00