1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
Commit Graph

10742 Commits

Author SHA1 Message Date
Yamagishi Kazutoshi
7512f3a3e0 Change message of public timeline for local only (#12224) 2019-10-27 12:45:33 +01:00
dependabot-preview[bot]
4a0281d8c4 [Glitch] Bump react-select from 2.4.4 to 3.0.5
Port 183fc9d3cb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 12:25:15 +01:00
Thibaut Girka
41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
Thibaut Girka
18c07738a6 Fix media components being cropped 2019-10-26 17:51:22 +02:00
Thibaut Girka
318362758b Hide overflowing characters from reply indicator too 2019-10-26 17:51:22 +02:00
Thibaut Girka
a24b954baa Avoid toot text bleeding out of the content div 2019-10-26 17:51:22 +02:00
Eugen Rochko
4988ebba4e
Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
Nima Boscarino
9b36f62df6 Add download button to audio and video players (#12179)
* Add download button for audio player

* Add download button for video player

* fix padding for download button in Audio component
2019-10-25 11:48:20 +02:00
Eugen Rochko
91945aa78a
Create stale.yml (#12207) 2019-10-25 11:47:40 +02:00
Faye Duxovni
48f75b86ae Add setting for whether to crop images in unexpanded toots (#12126) 2019-10-24 22:51:41 +02:00
Takeshi Umeda
a6269b2f83 Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
Nima Boscarino
a9530e29a2 Unliking a post updates like count on front end (#12140)
* return the new favourites_count
when unfavouriting a status

* Remove trailing whitespace

* revert changes to favourites_controller

* Decrease favourites_count through statuses reducer

* styling fix

* Fix missing trailing comma
2019-10-24 22:49:45 +02:00
ThibG
15c192ce40 Add link to search for users connected from the same IP address (#12157)
* Add link to search for users connected from the same IP address

Fixes #11949

* Fix missing cell in admin account view table
2019-10-24 22:49:26 +02:00
ThibG
bcf694dce7 Fix volume slider in chromium 🤷 (#12158)
Fixes #12156
2019-10-24 22:49:12 +02:00
BenisonSebastian
d3145ced1f Update README.md (#12164) 2019-10-24 22:48:21 +02:00
umonaca
f4be89e24d Improve swipe experience (#12168) 2019-10-24 22:48:11 +02:00
Hugo Gameiro
488dd0ff7a remove audio metadata (#12171) 2019-10-24 22:47:58 +02:00
ThibG
3a929dbedd Replace fav icon animation with CSS (#12175)
Fixes #12151
2019-10-24 22:47:48 +02:00
Hinaloe
547a5bac9d don't show outline of full-screen video (#12176) 2019-10-24 22:47:37 +02:00
kodai
5966d1b5a3 fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02:00
ThibG
aa884e0484 Fix batch actions being hidden from mobile view (#12183)
On mobile, batch actions are hidden from the settings/admin interface,
but there are several places those actions can only be performed through
batch actions.

This may not look great, but at least it makes the actions available again.
2019-10-24 22:46:59 +02:00
nightpool
9762fe382c microformat mentions can have an implicit property (#12189)
See the first example here: http://microformats.org/wiki/microformats2#hyperlinked_person
2019-10-24 22:46:15 +02:00
Soft. Dev
3ebd903535 change string from Disable to Disable login (#12201) 2019-10-24 22:45:55 +02:00
puckipedia
d2919f7e94 Allow Accept/Reject with a non-embedded object (#12199)
Some ActivityPub servers refuse to embed remote objects into their own
output. This is because they are not the authoritative source for these
objects, and as such embedding them is always a waste of space. The
follow request and follow models contain a URI, so this can be used to
match them.
2019-10-24 22:45:43 +02:00
ThibG
bd684e25d9 Fix incoming federation in whitelist mode (#12185)
… posting to the AP inbox required a logged-in local user…
2019-10-24 22:45:35 +02:00
BSKY
fccf83e1f2 Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
Thibaut Girka
984fce613e Change filter logic to keep filtered toots, but not mark them as unread
Keeping them in the TL fixes the front-end not being able to properly keep
track of pagination. Furthermore, filtered toots are not counted as unread
content, whether they are dropped or not.
2019-10-24 22:09:55 +02:00
dependabot-preview[bot]
237293fd8c [Security] Bump loofah from 2.2.3 to 2.3.1 (#12203)
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-24 14:49:09 +09:00
dependabot-preview[bot]
6bee7b820d Bump react-dom from 16.8.6 to 16.10.2 (#12107)
* Bump react-dom from 16.8.6 to 16.10.2

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.6 to 16.10.2.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.10.2/packages/react-dom)

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

* update react and react-test-renderer
2019-10-22 01:51:05 +09:00
dependabot-preview[bot]
e9e6ca9041 Bump oj from 3.9.1 to 3.9.2 (#12104)
Bumps [oj](https://github.com/ohler55/oj) from 3.9.1 to 3.9.2.
- [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.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:35:40 +09:00
dependabot-preview[bot]
f7f6f0726c Bump stackprof from 0.2.12 to 0.2.13 (#12103)
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.12 to 0.2.13.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.12...v0.2.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:33:59 +09:00
dependabot-preview[bot]
1a7cf80b7f Bump sidekiq-unique-jobs from 6.0.13 to 6.0.15 (#12102)
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.13 to 6.0.15.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.13...v6.0.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:32:18 +09:00
dependabot-preview[bot]
183fc9d3cb Bump react-select from 2.4.4 to 3.0.5 (#11930)
* Bump react-select from 2.4.4 to 3.0.5

Bumps [react-select](https://github.com/JedWatson/react-select) from 2.4.4 to 3.0.5.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/commits)

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

* Change import path for react-select
2019-10-22 01:31:27 +09:00
dependabot-preview[bot]
bc9c116e60 Bump sass from 1.22.12 to 1.23.0 (#12108)
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.12 to 1.23.0.
- [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.22.12...1.23.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:30:43 +09:00
dependabot-preview[bot]
912496de07 Bump derailed_benchmarks from 1.4.0 to 1.4.1 (#12101)
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases)
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.4.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 23:45:02 +09:00
dependabot-preview[bot]
7840844919 Bump rubocop from 0.74.0 to 0.75.1 (#12191)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.74.0 to 0.75.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.74.0...v0.75.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 23:43:49 +09:00
dependabot-preview[bot]
13b6d5d01b Bump @clusterws/cws from 0.15.0 to 0.15.2 (#12109)
Bumps @clusterws/cws from 0.15.0 to 0.15.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:32:43 +09:00
dependabot-preview[bot]
1ecd71c53e Bump eslint from 6.5.0 to 6.5.1 (#12110)
Bumps [eslint](https://github.com/eslint/eslint) from 6.5.0 to 6.5.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.5.0...v6.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:16:24 +09:00
dependabot-preview[bot]
ae945cb1f4 Bump cross-env from 5.2.0 to 6.0.3 (#12112)
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:16:01 +09:00
Thibaut Girka
069e0520c9 Fix notification filters not applying to poll options 2019-10-17 11:43:58 +02:00
Thibaut Girka
003bb6ca1a Refactor timeline filtering code 2019-10-17 11:43:58 +02:00
Thibaut Girka
b4046dc026 Drop filtered messages if the filter is “irreversible”
… instead of adding them to the timelines and then not showing them.
This fixes timelines showing new items when the only new items are
“irreversibly” filtered toots. This may be an edge case in Mastodon/glitch-soc,
but it is not in Pleroma, which does no filtering server-side whatsoever.
2019-10-17 11:43:58 +02:00
ThibG
fbe1de114f
Merge pull request #1236 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-10-11 22:58:31 +02:00
Thibaut Girka
10f1478498 Merge branch 'master' into glitch-soc/merge-upstream 2019-10-11 22:41:21 +02:00
ThibG
c2112c7781 [Glitch] Fix crash when switching back/from mobile layout
Port 91582937f3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-11 22:40:52 +02:00
ThibG
ef925f31a6
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-10-11 22:28:11 +02:00
Eugen Rochko
877e8c9d79 [Glitch] Fix media editing modal changing dimensions when image loads
Port 6ebd74f4fa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
Eugen Rochko
4ee167d89b [Glitch] Remove lang attribute from individual statuses
Port 538db85d3c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
trwnh
bd1eaad816 [Glitch] Add missing back button header for invalid account
Port 95f21ab87f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00
Eugen Rochko
9ba67c6045 [Glitch] Fix performance of home feed regeneration
Port front-end changes from f665901e3c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-10 21:00:13 +02:00