1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
8746f4d17b
Change priority of delete activity forwards for replies and reblogs ( #11002 )
...
Fix #11001
2019-06-09 12:47:33 +02:00
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
6c464cd424
Do not misattribute inlined boosts if `attributedTo` isn't present ( #10967 )
...
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
2019-06-04 23:24:31 +02:00
f2b743e715
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
2019-06-04 23:11:18 +02:00
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
3a84bacf86
Handle blank poll options more gracefully ( #10946 )
...
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
2019-06-03 20:04:00 +02:00
07d4ecfe5e
Truncate long URLs while providing alt text for inline images
2019-05-28 19:33:43 +02:00
18b77224d3
Translate incoming remote img tags by a link
2019-05-28 19:33:43 +02:00
20d01a954e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
1e5532e693
Add responsive panels to the single-column layout ( #10820 )
...
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
2019-05-25 21:27:00 +02:00
72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
d6a7d62dc6
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23 21:19:44 +02:00
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
9a5561a5b8
Fix possible race condition when processing statuses ( #10815 )
2019-05-23 20:00:39 +02:00
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23 12:28:33 +02:00
2332b3f146
Fix local text/html toots not being sanitized
2019-05-21 23:12:43 +02:00
9ca21e93cc
Minor optimization
2019-05-17 23:51:14 +02:00
dd5bf40b97
Properly escape HTML in code blocks
2019-05-17 23:51:14 +02:00
a6b7c23f6f
Add option for default toot content-type
2019-05-17 23:51:14 +02:00
0be93820f3
Fix autolinking, and newlines in code blocks
...
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
2019-05-17 23:51:14 +02:00
d7520f8175
Add support for HTML-formatted toots
2019-05-17 23:51:14 +02:00
94aef563b9
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
c1c8c7b2c8
Minor performance improvements and cleanup in formatter ( #10765 )
2019-05-15 06:54:06 +02:00
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
62f5235b6f
Prevent silenced local users from notifying remote users not following them ( #10575 )
...
* Prevent silenced local users from notifying remote users not following them
This is an attempt to extend the local restrictions of silenced users to the
federation.
* Add tests
* Add tests for making sure private status don't get sent over OStatus
2019-05-09 22:05:43 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
3e095cab83
Add support for missing formatting tags
2019-04-29 19:31:09 +02:00
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
27e8354914
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
2e3640ecbb
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
2019-04-22 23:07:14 +02:00
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
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
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-10 21:19:21 +02:00
a9f130b8d8
Fix Keybase verification using wrong domain for remote accounts ( #10547 )
2019-04-10 20:28:43 +02:00
f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
a4d5e15327
Fix config serializer regex ( #10487 )
2019-04-08 07:55:38 +02:00
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
1714ea5978
Add ActivityPub representation for identity proofs ( #10414 )
...
* Add ActivityPub representation for identity proofs
* Add tests
2019-03-30 02:12:06 +01:00
ce7d055d3c
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 18:35:25 +01:00
69141dca26
squashed identity proof updates ( #10375 )
2019-03-28 18:01:09 +01:00
050efbc126
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
f1bc90ab50
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
2019-03-28 04:44:59 +01:00
e86663b1da
Fix alternative relay support regression ( #10398 )
...
Fix #10324
2019-03-27 19:58:24 +01:00
11fe293e1b
Remove unused ActivityPub `@context` values depending on response ( #10378 )
...
Fix #8078
2019-03-27 15:55:23 +01:00
b9f314bba7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
e6cfa7ab89
Change language detector threshold from 140 characters to 4 words ( #10376 )
...
Add `lang` attribute to statuses in web UI
2019-03-26 01:23:59 +01:00
edd5441112
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-22 13:05:17 +01:00
3411fbef19
Improve config serializer for Keybase ( #10338 )
...
- Regex must no longer be surrounded by `/`
- Description must be short and cannot contain HTML tags
2019-03-21 23:33:28 +01:00
Thibaut Girka