mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-24 15:16:26 +09:00
Code
7,130 Commits 9 Branches 3 Tags 248 MiB
011b032300
Commit Graph

7130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG
011b032300 Provide a link to existing domain block when trying to block an already-blocked domain (#10663) 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
 2019-05-03 20:36:36 +02:00
Eugen Rochko
eb63217210
Add button to view context to media modal (#10676) 
* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal
 2019-05-03 16:16:30 +02:00
dependabot[bot]
ecbea2e3c6 Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 
* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0)

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

* fix payload[:request]
 2019-05-03 16:16:11 +02:00
dependabot[bot]
61e28b0ccc Bump scss_lint from 0.57.1 to 0.58.0 (#10678) 
Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases)
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 17:29:53 +09:00
dependabot[bot]
153b4ffc78 Bump fabrication from 2.20.1 to 2.20.2 (#10677) 
Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.1...2.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 15:01:38 +09:00
ThibG
5121d9c12f When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko
05ef3462ba
Make the "mark media as sensitive" button more obvious in web UI (#10673) 
* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"
 2019-05-03 04:34:55 +02:00
Eugen Rochko
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
Eugen Rochko
3f143606fa
Change account gallery in web UI (#10667) 
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
 2019-05-02 08:34:32 +02:00
ThibG
21a73c52a7 Check that an invite link is valid before bypassing approval mode (#10657) 
* Check that an invite link is valid before bypassing approval mode

Fixes #10656

* Add tests

* Only consider valid invite links in registration controller

* fixup
 2019-05-02 04:30:12 +02:00
ThibG
c4f2433300 Disallow robots from indexing /interact/ (#10666) 
This does not provide any new information and may just triple the number
of crawled pages
 2019-05-02 00:10:19 +02:00
ThibG
0db269f3dc Minor fixes to the French translation (#10662) 2019-05-01 22:19:55 +09:00
dependabot[bot]
699109b954 Bump rubocop from 0.68.0 to 0.68.1 (#10658) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.0...v0.68.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 15:49:16 +09:00
dependabot[bot]
825d5c79b7 Bump annotate from 2.7.4 to 2.7.5 (#10651) 
Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.4...2.7.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:06:09 +02:00
dependabot[bot]
7c94b190c8 Bump bullet from 5.9.0 to 6.0.0 (#10635) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:49 +02:00
dependabot[bot]
feff0fc9b2 Bump rubocop from 0.67.2 to 0.68.0 (#10654) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.67.2...v0.68.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:22 +02:00
partev
5e79dd3f17 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko
e18786dec7
Fix approved column being set to nil instead of false (#10642) 
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
 2019-04-27 23:55:16 +02:00
Eugen Rochko
fba96c808d
Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
Marek Ľach
c008911249 New string added for Slovak translation (#10637) 2019-04-26 18:07:36 +02:00
dependabot[bot]
8f4c34669f Bump bootsnap from 1.4.3 to 1.4.4 (#10634) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4.
- [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.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 13:36:56 +02:00
Eugen Rochko
e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
Eugen Rochko
f27d709351
Fix not being able to save e-mail preference for new pending accounts (#10622) 2019-04-25 02:49:06 +02:00
ThibG
852ccea676 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
ThibG
b1a0322a06 Reject follow requests of blocked users (#10633) 2019-04-25 02:47:33 +02:00
dependabot[bot]
80bbf40ff1 Bump sidekiq from 5.2.6 to 5.2.7 (#10627) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 16:39:06 +02:00
dependabot[bot]
db61383f82 Bump capybara from 3.17.0 to 3.18.0 (#10626) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.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.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 18:53:52 +09:00
Eugen Rochko
8a0d677cde
Fix stoplight logging to stderr separate from Rails logger (#10624) 2019-04-23 04:39:48 +02:00
Eugen Rochko
041fb0e840
Fix sign up button not saying sign up when invite is used (#10623) 
Fix #10616
 2019-04-23 04:39:21 +02:00
dependabot[bot]
f99bfb9496 [Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 10:02:58 +09:00
dependabot[bot]
703cdf2a0c Bump capybara from 3.16.2 to 3.17.0 (#10602) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.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.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 00:54:51 +02:00
Fabian Schlenz
50b36ef59d Fixed Healthchecks in docker-compose.yml (#10553) 2019-04-23 00:54:26 +02:00
dependabot[bot]
fd9f5a467f Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.1.
- [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.36.0...v1.36.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 15:03:20 +02:00
dependabot[bot]
5c34163dbc Bump doorkeeper from 5.0.2 to 5.1.0 (#10598) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 15:02:59 +02:00
ThibG
0e78862b61 Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
kedama
d763d39d26 Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00
ThibG
bdec58b514 Minor code cleanup (#10613) 2019-04-22 14:55:24 +02:00
dependabot[bot]
c9441bf82e Bump cld3 from 3.2.3 to 3.2.4 (#10617) 
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 14:54:19 +02:00
marcin mikołajczak
46321dc993 i18n: Fix misleading strings in Polish translation (#10615) 2019-04-21 22:30:04 +02:00
jeroenpraat
cf5414e5d3 Small fix Dutch translation (#10612) 
* Small fix Dutch translation

* Better descriptive titles

See #10611
 2019-04-21 18:44:51 +02:00
Yamagishi Kazutoshi
a430f2a03e i18n: Update Catalan translation (#10559) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-04-21 04:53:45 +02:00
Ben Lubar
be8692b938 Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565) 2019-04-21 04:53:24 +02:00
Yamagishi Kazutoshi
80c9cb0eb3 Add hi.json (#10573) 2019-04-21 04:52:20 +02:00
dependabot[bot]
aa484e2cb3 Bump webpush from 0.3.7 to 0.3.8 (#10592) 
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-21 04:49:44 +02:00
dependabot[bot]
a5c0aae984 Bump lograge from 0.10.0 to 0.11.0 (#10588) 
Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-21 04:49:05 +02:00
partev
d210d0a655 Update hy.json (#10591) 2019-04-21 04:48:47 +02:00
Daniel Aleksandersen
10bdd912d6 Treat meta[property] as a space-separated list (#10604) 
The @property attribute in HTML is a space-separated list of values.
This change normalizes whitespace and finds the desired value in
the list instead of requiring an exact single-value match.

More details:
https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
 2019-04-21 04:48:19 +02:00
Jessica
01b1c377b1 Animate avatar GIFs on-hover on public profiles (#10549) 
* Third time is the charm?

* Use full asset URL for data-static and data-original

̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
 2019-04-21 04:47:39 +02:00
jeroenpraat
951f8d5b44 Update NL (Dutch) translation (#10601) 
* Update NL language strings

Have to do it this way, cause this file is locked on Weblate

* fix

* Update simple_form.nl.yml

* Update nl.yml
 2019-04-21 04:46:08 +02:00
ThibG
6e620dcab1 Use correct local names for fonts (#10594) 2019-04-21 04:42:02 +02:00