treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,199 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

8199 Commits (cabf2772ea0427bbb377505b41b87d6c39fc8f64)

Author SHA1 Message Date
ThibG 80ef517747 Allow hyphens in the middle of remote user names (#9345) 
Fixes #9309

This only allows hyphens in the middle of a username, much like dots,
although I don't have a compelling reason to do so other than keeping
the changes minimal.
 2018-11-27 12:28:01 +01:00
dependabot[bot] 2490dcffe4 Bump tty-prompt from 0.17.2 to 0.18.0 (#9354) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.2 to 0.18.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.2...v0.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 12:27:00 +01:00
Sumit Khanna b7229bef1a Volume sliders for videos #7429 (#9366) 
* Volume sliders for videos #7429

* Code formatting updates

* Code formatting updates
 2018-11-27 12:25:38 +01:00
Hugo Gameiro 92238e2f7a add loglevel to ffmpeg in gif upload (#9368) 2018-11-27 12:19:12 +01:00
Eugen Rochko 305556274a Redesign admin accounts index (#9340) 
* Improve overview of accounts in admin UI

- Display suspended status, role, last activity and IP prominently
- Default to showing local accounts
- Default to not showing suspended accounts

* Remove unused strings

* Fix tests

* Allow filtering accounts by IP mask
 2018-11-26 15:53:27 +01:00
valerauko 2178c50fed Ensure replied-to is a status not a boost (#9129) 
* Ensure replied-to is a status not a boost

* Consider case of not a reply

* Add test case for replying to boost

* Move reblog-reply resolution to model

* Remove unnecessary comment
 2018-11-25 16:35:21 +01:00
takayamaki 057097e8ad check_boxes label should use display: inline-block (#9348) 2018-11-25 16:26:15 +01:00
Thibaut Girka 550c523233 Update MediaGallery and Video props when folding/unfolding CWs in detailed statuses 2018-11-25 11:29:56 +01:00
Thibaut Girka b8018a1bcb Render placeholder when inline video container width isn't known 2018-11-25 11:29:56 +01:00
Thibaut Girka e80f770118 Render placeholder instead of image when MediaGallery container width isn't known 2018-11-25 11:29:56 +01:00
Eugen Rochko 1d16575d71 Sort self-replies to the top of descendants (#9320) 
Fix #6463
 2018-11-24 20:48:50 +01:00
Eugen Rochko e49abb3b4f Revert "Sort self-replies to the top of the thread (#9296)" (#9335) 
This reverts commit 76a0c28687.

Fix #9315
 2018-11-23 21:58:01 +01:00
dependabot[bot] fd8841ce92 Bump simple_form from 4.0.1 to 4.1.0 (#9331) 
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-23 14:29:59 +09:00
Eugen Rochko f3fee3cd27 Fix connect timeout not being enforced (#9329) 
* Fix connect timeout not being enforced

The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds.

* Use timeout on each IP attempt, but limit to 2 attempts

* Fix code style issue

* Do not break Request#perform if no block given

* Update method stub in spec for Request

* Move timeout inside the begin/rescue block

* Use Resolv::DNS with timeout of 1 to get IP addresses

* Update Request spec to stub Resolv::DNS instead of Addrinfo

* Fix Resolve::DNS stubs in Request spec
 2018-11-22 20:12:04 +01:00
valerauko a6ebcda59b Ignore JSON-LD profile in mime type comparison (#9179) 
Ignore JSON-LD profile in mime type comparison
 2018-11-22 12:49:07 +01:00
dependabot[bot] 65989166e0 Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306) 
Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/aprescott/sidekiq-bulk/releases)
- [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md)
- [Commits](https://github.com/aprescott/sidekiq-bulk/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 12:47:36 +01:00
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