mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 15:44:56 +01:00
Code Issues Projects Releases Wiki Activity
10,212 Commits 137 Branches 269 Tags 929 MiB
3aeaf9b897
Commit Graph

10212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mélanie Chauvel (ariasuni)
c4043ba2f2 Fix jumping of toot date when clicking spoiler button (#11449) 
* Fix jumping of toot date when clicking spoiler button

* Fix lint
 2019-07-31 10:06:58 +02:00
Eugen Rochko
e46e9c9a8e
Fix delete regression (#11450) 
Regression from ff789a751a
 2019-07-31 09:23:30 +02:00
Eugen Rochko
92de439c04
Change hashtag search to only return results that have trended in the past (#11448) 
* Change hashtag search to only return results that have trended in the past

A way to eliminate typos and other one-off "junk" results

* Fix excluding exact matches that don't have a score

* Fix tests
 2019-07-30 20:29:50 +02:00
ThibG
4ecfa8f298
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-30 15:40:28 +02:00
ThibG
ff789a751a Fix boosting & unboosting preventing a boost from appearing in the TL (#11405) 
* Fix boosting & unboosting preventing a boost from appearing in the TL

* Add tests

* Avoids side effects when aggregate_reblogs isn't true
 2019-07-30 13:18:23 +02:00
Eugen Rochko
648cdbc04a
Add hashtag score for better sorting of autosuggestions (#11427) 
* Add hashtag score for better sorting of autosuggestions

* Do not use `~<~` operator with no text_pattern_ops index
 2019-07-30 13:10:40 +02:00
ThibG
d8097ecd2f [Glitch] Fix crash when expanding search results for hashtags 
Port 78144f4c79 to glitch-soc
 2019-07-30 12:31:02 +02:00
Thibaut Girka
24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
 2019-07-30 12:22:33 +02:00
ThibG
b31b232edf Change links in webUI to rewrite misleading links (#11426) 
* [WiP] Show host for “misleading” links

* Disallow misleading targets which domain names are prefixes of link text

* Move decodeIDNA to app/javascript/mastodon/utils

* Add support for international domain names

* Change link origin tag color to darker text color

* Handle links to domains starting with www. as shortened by Mastodon

* [WiP] Ignore links that cannot be misread as URLs, rewrite other links
 2019-07-30 12:13:29 +02:00
ThibG
78144f4c79 Fix crash when expanding search results for hashtags (#11447) 2019-07-30 12:06:21 +02:00
Eugen Rochko
24552b5160
Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
ThibG
f48c7689d2
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-29 23:37:14 +02:00
dependabot-preview[bot]
85b7b565de Bump yargs from 12.0.5 to 13.3.0 (#11434) 
Bumps [yargs](https://github.com/yargs/yargs) from 12.0.5 to 13.3.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v12.0.5...v13.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 20:42:19 +02:00
Milan
658277b07e let bundler fetch http_parser.rb submodules (#11444) 2019-07-29 20:42:04 +02:00
Eugen Rochko
e136112ab7
Fix tag normalization and migration not removing duplicate tags (#11441) 
Fix #11428
 2019-07-29 20:40:21 +02:00
dependabot-preview[bot]
aefeb65656 Bump oj from 3.8.0 to 3.8.1 (#11435) 
Bumps [oj](https://github.com/ohler55/oj) from 3.8.0 to 3.8.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.8.0...v3.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:51:03 +09:00
dependabot-preview[bot]
44ae763312 Bump capybara from 3.26.0 to 3.27.0 (#11437) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.26.0 to 3.27.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.26.0...3.27.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:48:56 +09:00
dependabot-preview[bot]
f3d7b168a7 Bump httplog from 1.3.1 to 1.3.2 (#11436) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.3.1...v1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:39:54 +09:00
dependabot-preview[bot]
dbb74ad351 Bump brakeman from 4.5.1 to 4.6.1 (#11438) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.1 to 4.6.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.1...v4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:37:02 +09:00
dependabot-preview[bot]
a586248f08 Bump sass from 1.20.3 to 1.22.7 (#11432) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.20.3 to 1.22.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.20.3...1.22.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:30:43 +09:00
dependabot-preview[bot]
6aca7969c9 Bump aws-sdk-s3 from 1.45.0 to 1.46.0 (#11439) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.45.0 to 1.46.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.45.0...v1.46.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:29:17 +09:00
dependabot-preview[bot]
25731bafed Bump autoprefixer from 9.6.0 to 9.6.1 (#11431) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.6.0 to 9.6.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.0...9.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:06:15 +09:00
Eugen Rochko
784c88e16d
Fix emoji autosuggestions (#11442) 
Regression from cfb2ed7823
 2019-07-29 15:04:49 +02:00
dependabot-preview[bot]
2f0820963d Bump @babel/preset-env from 7.4.5 to 7.5.5 (#11433) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 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.5...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:03:05 +09:00
dependabot-preview[bot]
e9a7d721d8 Bump file-loader from 4.0.0 to 4.1.0 (#11430) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.0.0...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 21:54:14 +09:00
Thibaut Girka
a4a81c5434 Fix crash in /web/lists 
Fixes #1181
 2019-07-29 00:34:39 +02:00
Eugen Rochko
b9b0313c78
Revert "Remove conversation URI (#11423)" (#11424) 
This reverts commit 75f7f9930e.
 2019-07-28 17:47:37 +02:00
Eugen Rochko
75f7f9930e
Remove conversation URI (#11423) 
It is not part of ActivityPub and will free up a lot of space
 2019-07-28 17:30:12 +02:00
Eugen Rochko
51411267fd [Glitch] Add search results pagination to web UI (#11409) 
Port 8a4674f2c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-28 17:10:52 +02:00
ThibG
7f147acea6 [Glitch] Change contrast of status links that are not mentions nor hashtags 
Port 10e78ecf57 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-28 16:47:36 +02:00
Eugen Rochko
31fc3be0a4 [Glitch] Change account domain block to clear out notifications and follows 
Port 4eeff26533 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-28 16:45:36 +02:00
Thibaut Girka
bca3825c17 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
Eugen Rochko
cfb2ed7823
Add autosuggestions for hashtags (#11422) 2019-07-28 14:37:52 +02:00
dependabot-preview[bot]
15de24a425 Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316) 
* Bump json-ld-preloaded from 3.0.2 to 3.0.3

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3)

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

* use json-ld edge
 2019-07-28 13:48:43 +02:00
mayaeh
0d80f686d8 Add tootctl preview_cards remove (#11320) 
* Add `tootctl preview_cards remove`

* fix code style

* Remove `Scheduler::PreviewCardsCleanupScheduler` file

* fix code style again
Add exclude case where image_file_name is blank

* Added a function to output confirmation if the specified number of days is less than 2 weeks
 2019-07-28 13:48:19 +02:00
ThibG
9349f1067a Fix animate on hover in poll options without CW (#11404) 2019-07-28 13:48:04 +02:00
Jeong Arm
6a1f08d29a Prevent archiving when user set "noindex" (#11421) 2019-07-28 13:46:04 +02:00
ThibG
10e78ecf57 Change contrast of status links that are not mentions nor hashtags (#11406) 2019-07-28 06:00:51 +02:00
Eugen Rochko
f371b32137
Change hashtags to preserve first-used casing (#11416) 2019-07-28 05:59:51 +02:00
Eugen Rochko
4cc29eb5ad
Fix tabs bar scrolling along with content on mobile (#11418) 2019-07-27 19:25:15 +02:00
ysksn
d6ada2eb30 Implement pending tests (#11415) 2019-07-27 10:24:26 +02:00
Eugen Rochko
8a4674f2c3
Add search results pagination to web UI (#11409) 
* Add search results pagination to web UI

Fix #10737

* Fix code style issue
 2019-07-27 05:49:50 +02:00
Eugen Rochko
b9fbcbfe4e
Add search syntax for operators and phrases (#11411) 2019-07-27 04:42:08 +02:00
Eugen Rochko
501148ab91
Remove timestamps from converted images to make them deterministic (#11408) 2019-07-27 04:41:55 +02:00
ThibG
92569ffde8 Fix invites not being disabled upon account suspension (#11412) 
* Disable invite links from disabled/suspended users

* Add has_many invites relationship to users

* Destroy unused invites when suspending an account
 2019-07-26 18:55:33 +02:00
Clar Fon
a6b4440115 Remove pre from version, add extra suffix variable (#11407) 2019-07-26 07:57:27 +02:00
ThibG
d0c25584b8 Change settings to show restricted accounts only what they have access to (#11394) 
Follow-up to 964ae8eee5
 2019-07-25 04:22:09 +02:00
Eugen Rochko
4eeff26533
Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
Thibaut Girka
91da921dbb Fix links in status media having their title rewritten 2019-07-24 21:46:09 +02:00
ThibG
88e79c179a
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-24 16:53:25 +02:00