eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
f743f7a7bf
Fix NotificationMailer failing when receiving mention with media from remote instance ( #11765 )
2019-09-05 06:14:30 +02:00
f6cd27f41f
Fix line breaks in hashtag autosuggestions in web UI ( #11764 )
2019-09-05 06:14:06 +02:00
09fe562dd6
Fix wrong variable regression from #11753 ( #11763 )
2019-09-05 06:13:50 +02:00
5f6fd01ea6
Attempt to concurrently connect to remote IP addresses ( #11757 )
...
* Attempt to concurrently connect to remote IP addresses
* Reduce code length to please CodeClimate 🤷
2019-09-05 05:32:53 +02:00
41152c7b99
Bump addressable from 2.6.0 to 2.7.0 ( #11732 )
...
Bumps [addressable](https://github.com/sporkmonger/addressable ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases )
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.6.0...addressable-2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 12:31:47 +09:00
7599b4b3b6
Bump capistrano from 3.11.0 to 3.11.1 ( #11731 )
...
* Bump capistrano from 3.11.0 to 3.11.1
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* 3.11.1
2019-09-05 12:04:45 +09:00
6899564a76
Exclude URLs from text analysis ( #11759 )
...
By the added regex, URLs, including the one without http or even www
like mysite.com will be removed from the toot's body so only the real
text of the toot will be analyzed for RTL detection
2019-09-04 22:30:49 +02:00
4f9f1c6a98
Add PERSISTENT_TIMEOUT option ( #11756 )
...
Add environment variable to so `persistent_timeout` option of puma can be changed.
2019-09-04 20:44:08 +02:00
17bb2b5e06
Bump aws-sdk-s3 from 1.46.0 to 1.48.0 ( #11729 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.46.0 to 1.48.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/compare/v1.46.0...v1.48.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:46:37 +09:00
3d1a8d1eca
Bump rubocop-rails from 2.3.1 to 2.3.2 ( #11728 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:45:44 +09:00
decfba58ab
Bump bootsnap from 1.4.4 to 1.4.5 ( #11730 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.4...v1.4.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:45:20 +09:00
908db96571
Bump faker from 2.1.2 to 2.2.1 ( #11733 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.2...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:44:01 +09:00
645f9ffe45
Bump webmock from 3.6.2 to 3.7.1 ( #11734 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 01:42:35 +09:00
8d587eafe5
Fix loading more items in account following/followers
2019-09-04 17:58:31 +02:00
b5651654f7
Fix wrong sum of usage in hashtag component in web UI ( #11755 )
...
1 + 1 = 11
2019-09-04 10:10:18 +02:00
17df40e74e
Fix wrong pluralization in hashtag component in web UI ( #11754 )
2019-09-04 04:14:13 +02:00
7ef93513f7
Change account deletion page to have better explanations ( #11753 )
...
Fix deletion of unconfirmed account not freeing up the username
Add prefill of logged-in user's email in the reconfirmation form
2019-09-04 04:13:54 +02:00
ecd444dc99
Fix admin interface showing superfluous reject media/reports on suspended blocks ( #11749 )
...
* Fix admin interface showing superfluous reject media/reports on suspended domains
* Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
2019-09-03 22:53:27 +02:00
8b271d6d25
Fix ActivityPub context not being dynamically computed ( #11746 )
...
* Fix contexts not being dynamically included
Fixes #11649
* Refactor Note context in serializer
* Refactor Actor serializer
2019-09-03 22:52:32 +02:00
ae3c1fbf40
Fix error in admin UI for hashtag usage breakdown ( #11743 )
2019-09-03 07:59:52 +02:00
8d61ef6dda
Change hashtag component in web UI to show numbers for 2 last days ( #11742 )
...
To deal with the midnight problem
2019-09-03 06:35:44 +02:00
97beb5d3de
Fix error in user warning template ( #11741 )
2019-09-03 05:57:30 +02:00
2807f39900
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
2019-09-03 04:57:07 +02:00
feeecba886
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
2019-09-03 04:56:54 +02:00
acf168f1a2
Fix uncached media in web UI not being clickable ( #11745 )
2019-09-03 04:56:40 +02:00
3cd3cb6a41
Add SMTP reply_to option ( #11718 )
...
* Add SMTP_REPLY_TO in .env.production.sample
* Set reply_to in SMTP options
2019-09-02 18:12:40 +02:00
80fe7fa415
Integrate translation strings for the Profile Directory. ( #11722 )
...
Run `yarn manage:translations en`
2019-09-02 18:12:27 +02:00
06f49d9cf2
Fix Mastodon logo style on hover on public pages' footer ( #11735 )
...
Fixes #11690
2019-09-02 18:12:12 +02:00
c5e4f4e0c1
Fix height of dashboard counters ( #11736 )
2019-09-02 18:11:34 +02:00
436266ca27
Change trending hashtags to not disappear instantly after midnight ( #11712 )
2019-09-02 18:11:13 +02:00
eab0addad7
Bump babel-eslint from 10.0.2 to 10.0.3 ( #11723 )
...
Bumps [babel-eslint](https://github.com/babel/babel-eslint ) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases )
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02 20:19:16 +09:00
a651859fd3
Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 ( #11725 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.4.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02 20:18:22 +09:00
24611e1076
[Glitch] Add header to trends section and change refresh rate to 15 minutes
...
Port cf56532ced
2019-09-02 10:57:44 +02:00
7d388731dc
[Glitch] Restore hashtag suggestions from local tag history
...
Port d94a4763f6
2019-09-02 10:57:44 +02:00
66925dce64
[Glitch] Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
...
Port db5c84ce4b
2019-09-02 10:57:44 +02:00
fe085973a3
Fix trending hashtags spacing in single-column mode
2019-09-02 10:57:44 +02:00
4d0d1bf65f
[Glitch] Add trends to public pages sidebar
...
Port 87df04d94c
2019-09-02 10:57:44 +02:00
62c1003b41
[Glitch] Fix hashtag autosuggestions line breaks for long suggestions
...
Port 193df2e8cb
2019-09-02 10:57:44 +02:00
c43fb46d0c
[Glitch] Fix trending counter width
...
Port 406f2f7d57
2019-09-02 10:57:44 +02:00
157d78dd44
[Glitch] Add trends UI with admin and user settings
...
Port 191392e5c3
2019-09-02 10:57:44 +02:00
f0c559250c
[Glitch] Fix emoji autosuggestions
...
Port 32d2260a8c
2019-09-02 10:57:44 +02:00
c3c61f3011
Refactor SCSS to better match upstream
2019-09-02 10:57:44 +02:00
cc3ca37cda
[Glitch] Add autosuggestions for hashtags
...
Port 450b8a70a5
2019-09-02 10:57:44 +02:00
1443f2bd3c
Fix custom emoji animation on hover in WebUI directory bios ( #11716 )
2019-09-01 20:04:35 +02:00
76bdc01aee
Fix wrong percentages in admin UI for hashtag usage breakdown ( #11714 )
2019-09-01 19:44:05 +02:00
59d873e1e5
Add "not available" label on unknown media attachments ( #11715 )
2019-09-01 19:43:35 +02:00
0c5a16c5d0
Update NodeJS source for Docker Image ( #11707 )
...
* Update Ruby/Node/jemalloc source for Docker Image
* Update Dockerfile
* Update Dockerfile
2019-08-31 20:07:29 +02:00
911ebfea45
Update Dockerfile ( #11710 )
2019-08-31 20:06:49 +02:00
b72317c2b7
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-31 19:44:47 +02:00
Thibaut Girka