tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,523 Commits 10 Branches 0 Tags
14f797873d86aed085dad2ff60c8dad2ab3d4b7b
Commit Graph

10523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
7b1b968b73 Bump fastimage from 2.1.5 to 2.1.7 (#11785) 
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.5 to 2.1.7.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.5...v2.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 20:10:17 +09:00
dependabot-preview[bot]
9aa2a5320e Bump sanitize from 5.0.0 to 5.1.0 (#11786) 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.0.0...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 20:08:45 +09:00
dependabot-preview[bot]
4f3e183dc8 Bump jest from 24.8.0 to 24.9.0 (#11781) 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 20:07:02 +09:00
dependabot-preview[bot]
5dcacde6a2 Bump mime-types from 3.2.2 to 3.3 (#11788) 
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.2.2 to 3.3.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases)
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md)
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.2.2...v3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 20:03:07 +09:00
dependabot-preview[bot]
a9ea638a49 Bump json-ld-preloaded from 3.0.3 to 3.0.4 (#11790) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.3...3.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:52:33 +09:00
dependabot-preview[bot]
3642021d58 Bump oj from 3.9.0 to 3.9.1 (#11789) 
Bumps [oj](https://github.com/ohler55/oj) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:50:38 +09:00
Eugen Rochko
261e52268c Add batch approve/reject for pending hashtags in admin UI (#11791) 2019-09-09 12:50:09 +02:00
dependabot-preview[bot]
3feacd2b14 Bump faker from 2.2.1 to 2.2.2 (#11787) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.1 to 2.2.2.
- [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.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:49:54 +09:00
dependabot-preview[bot]
3b10307e2c Bump devise from 4.7.0 to 4.7.1 (#11784) 
* Bump devise from 4.7.0 to 4.7.1

Bumps [devise](https://github.com/plataformatec/devise) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.0...v4.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* bcrypt (3.1.12)
 2019-09-09 19:49:13 +09:00
dependabot-preview[bot]
c12cdbe81c Bump @babel/preset-env from 7.5.5 to 7.6.0 (#11780) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [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.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:42:39 +09:00
dependabot-preview[bot]
9fa5c43d80 Bump tesseract.js from 2.0.0-alpha.13 to 2.0.0-alpha.15 (#11779) 
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.13 to 2.0.0-alpha.15.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.13...v2.0.0-alpha.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:40:30 +09:00
Takeshi Umeda
9c9dcf580a Add featured tags API (#11778) 
* Add featured tags API

* Remove show and update, change scope, fix code style
 2019-09-09 10:50:33 +02:00
Rey Tucker
0014a32c19 glitch: fix webpack build failure in columns_area.js (#1212) 
Fixes #1212 by copying what works in the mainline flavor.
 2019-09-09 09:56:37 +02:00
Eugen Rochko
a75009a65e Change half-life of trend decay (#11774) 2019-09-08 19:17:57 +02:00
Yamagishi Kazutoshi
d7ed697030 Use prebuilt node.js on Docker image (#11768) 2019-09-07 05:12:20 +02:00
Yamagishi Kazutoshi
d7268befa8 Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
Eugen Rochko
e445a8af64 Add timeline read markers API (#11762) 
Fix #4093
 2019-09-06 13:55:51 +02:00
ThibG
286bf110c3 Merge pull request #1211 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-09-06 12:06:59 +02:00
Yamagishi Kazutoshi
cf643d0060 Add method and enctype to manifest (#11767) 2019-09-05 15:51:51 +02:00
Eugen Rochko
4434e2eb7f [Glitch] Fix line breaks in hashtag autosuggestions in web UI 
Port 7db2c2e2ba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:14:42 +02:00
Mostafa Ahangarha
bd0bde1da2 [Glitch] Exclude URLs from text analysis 
Port e974d4923f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:13:03 +02:00
Eugen Rochko
a869572aab [Glitch] Fix wrong sum of usage in hashtag component in web UI 
Port a6a63358c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:12:18 +02:00
Eugen Rochko
4907517db4 [Glitch] Fix wrong pluralization in hashtag component in web UI 
Port 1a00bd9244 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:11:52 +02:00
Eugen Rochko
ca86858558 [Glitch] Change hashtag component in web UI to show numbers for 2 last days 
Port d19d86fe2b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:02:54 +02:00
Eugen Rochko
b86292af33 [Glitch] Fix uncached media in web UI not being clickable 
Port 34adc8784a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 14:02:04 +02:00
mayaeh
dea2b234c9 [Glitch] Integrate translation strings for the Profile Directory. 
Port 1f22b8197c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 13:55:14 +02:00
ThibG
7db6cb93f3 [Glitch] Fix Mastodon logo style on hover on public pages' footer 
Port 0ea53122f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 13:53:23 +02:00
ThibG
96b9d3333d [Glitch] Fix height of dashboard counters 
Port 6493f4ffae to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 13:52:53 +02:00
ThibG
2f952f6d04 [Glitch] Fix custom emoji animation on hover in WebUI directory bios 
Port 34eac5a1ec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 13:52:07 +02:00
Eugen Rochko
23c513846a [Glitch] Add "not available" label on unknown media attachments 
Port d344289431 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-05 13:06:41 +02:00
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