Thibaut Girka
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
mayaeh
e265b8887d
Fix NotificationMailer failing when receiving mention with media from remote instance ( #11765 )
2019-09-05 06:14:30 +02:00
Eugen Rochko
7db2c2e2ba
Fix line breaks in hashtag autosuggestions in web UI ( #11764 )
2019-09-05 06:14:06 +02:00
Eugen Rochko
58755439ac
Fix wrong variable regression from #11753 ( #11763 )
2019-09-05 06:13:50 +02:00
ThibG
1653b58777
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
dependabot-preview[bot]
529856a608
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
dependabot-preview[bot]
c46dcf77c6
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
Mostafa Ahangarha
e974d4923f
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
Yamagishi Kazutoshi
bdca8da8eb
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
dependabot-preview[bot]
80f86f290f
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
dependabot-preview[bot]
1b3c2598fa
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
dependabot-preview[bot]
beba6824e1
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
dependabot-preview[bot]
e9dbb955a8
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
dependabot-preview[bot]
15d6a10c02
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
Thibaut Girka
0128509605
Fix loading more items in account following/followers
2019-09-04 17:58:31 +02:00
Eugen Rochko
a6a63358c3
Fix wrong sum of usage in hashtag component in web UI ( #11755 )
...
1 + 1 = 11
2019-09-04 10:10:18 +02:00
Eugen Rochko
1a00bd9244
Fix wrong pluralization in hashtag component in web UI ( #11754 )
2019-09-04 04:14:13 +02:00
Eugen Rochko
43f56f1291
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
ThibG
c1e238a77b
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
ThibG
692c5b439a
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
Eugen Rochko
ec1dd865fb
Fix error in admin UI for hashtag usage breakdown ( #11743 )
2019-09-03 07:59:52 +02:00
Eugen Rochko
d19d86fe2b
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
Eugen Rochko
92a6fa6c90
Fix error in user warning template ( #11741 )
2019-09-03 05:57:30 +02:00
Eugen Rochko
16c1abdb2d
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
2019-09-03 04:57:07 +02:00
Eugen Rochko
3221f998dd
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
2019-09-03 04:56:54 +02:00
Eugen Rochko
34adc8784a
Fix uncached media in web UI not being clickable ( #11745 )
2019-09-03 04:56:40 +02:00
Hugo Gameiro
5466b39c78
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
mayaeh
1f22b8197c
Integrate translation strings for the Profile Directory. ( #11722 )
...
Run `yarn manage:translations en`
2019-09-02 18:12:27 +02:00
ThibG
0ea53122f2
Fix Mastodon logo style on hover on public pages' footer ( #11735 )
...
Fixes #11690
2019-09-02 18:12:12 +02:00
ThibG
6493f4ffae
Fix height of dashboard counters ( #11736 )
2019-09-02 18:11:34 +02:00
Eugen Rochko
70ddef2654
Change trending hashtags to not disappear instantly after midnight ( #11712 )
2019-09-02 18:11:13 +02:00
dependabot-preview[bot]
ac6935b629
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
dependabot-preview[bot]
dd45df6630
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
Eugen Rochko
ce182efd68
[Glitch] Add header to trends section and change refresh rate to 15 minutes
...
Port 4ef8d8b77c
2019-09-02 10:57:44 +02:00
ThibG
12c188f533
[Glitch] Restore hashtag suggestions from local tag history
...
Port 5ab1e0e738
2019-09-02 10:57:44 +02:00
ThibG
e1810eed8e
[Glitch] Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
...
Port d857d0d14d
2019-09-02 10:57:44 +02:00
Thibaut Girka
b30a7f5120
Fix trending hashtags spacing in single-column mode
2019-09-02 10:57:44 +02:00
Eugen Rochko
34eff39936
[Glitch] Add trends to public pages sidebar
...
Port c6b4b923e6
2019-09-02 10:57:44 +02:00
Eugen Rochko
717f3998c0
[Glitch] Fix hashtag autosuggestions line breaks for long suggestions
...
Port cd660d374a
2019-09-02 10:57:44 +02:00
Sasha Sorokin
771b01e785
[Glitch] Fix trending counter width
...
Port a5a5a0adec
2019-09-02 10:57:44 +02:00
Eugen Rochko
8b630f7e54
[Glitch] Add trends UI with admin and user settings
...
Port 9072fe5ab6
2019-09-02 10:57:44 +02:00
Eugen Rochko
3c70fb9146
[Glitch] Fix emoji autosuggestions
...
Port 784c88e16d
2019-09-02 10:57:44 +02:00
Thibaut Girka
be8b0e8d06
Refactor SCSS to better match upstream
2019-09-02 10:57:44 +02:00
Eugen Rochko
3380e96449
[Glitch] Add autosuggestions for hashtags
...
Port cfb2ed7823
2019-09-02 10:57:44 +02:00
ThibG
34eac5a1ec
Fix custom emoji animation on hover in WebUI directory bios ( #11716 )
2019-09-01 20:04:35 +02:00
Eugen Rochko
47584180d8
Fix wrong percentages in admin UI for hashtag usage breakdown ( #11714 )
2019-09-01 19:44:05 +02:00
Eugen Rochko
d344289431
Add "not available" label on unknown media attachments ( #11715 )
2019-09-01 19:43:35 +02:00
Shlee
59b013df5f
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
Shlee
33f4b6e1eb
Update Dockerfile ( #11710 )
2019-08-31 20:06:49 +02:00
ThibG
147e90f35d
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-31 19:44:47 +02:00
