b9d75e49c2
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-10 12:10:26 +02:00
cc6b8a9615
Fix WebUI crash when processing accounts before page is loaded ( #14015 )
2020-06-09 20:53:20 +02:00
e9d7ca7645
[Glitch] Fix WebUI crash when loading account data before page is loaded
2020-06-09 11:55:07 +02:00
00cd919750
[Glitch] Add hotkey for toggling content warning composer field
...
Port 6b6a9d0ea3
2020-06-09 11:14:20 +02:00
5e07deefc1
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-09 11:12:53 +02:00
304721edc1
[Glitch] Improve rendering of emoji which do not contrast with background
...
Port db319c0fdc
2020-06-09 11:07:32 +02:00
4657c1a1ca
[Glitch] FIX: filters ignore media descriptions
...
Port c66403b257
2020-06-09 11:02:24 +02:00
776aff9656
[Glitch] Hide sensitive preview cards with blurhash
...
Port 8e96510b25
2020-06-09 11:01:31 +02:00
2da2f7f7c2
[Glitch] Fix ref attr for react-textarea-autozsize
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 10:55:52 +02:00
12c8ac9e14
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict due to glitch-soc having to take care of local-only
pinned toots in that controller.
Took upstream's changes and restored the local-only special
handling.
- `app/controllers/auth/sessions_controller.rb`:
Minor conflicts due to the theming system, applied upstream
changes, adapted the following two files for glitch-soc's
theming system:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`
- `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
Minor conflict due to glitch-soc having to handle local-only
toots specially. Applied upstream changes and restored
the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
Minor conflict due to the theming system.
- `package.json`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
- `yarn.lock`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
2020-06-09 10:39:20 +02:00
6b6a9d0ea3
Add hotkey for toggling content warning composer field ( #13987 )
2020-06-09 10:32:32 +02:00
89f40b6c3e
Make domain block/silence/reject-media code more robust ( #13424 )
...
* Split media cleanup from reject-media domain blocks to its own service
* Slightly improve ClearDomainMediaService error handling
* Lower DomainClearMediaWorker to lowest-priority queue
* Do not catch ActiveRecord::RecordNotFound in domain block workers
* Fix DomainBlockWorker spec labels
* Add some specs
* Change domain blocks to immediately mark accounts as suspended
Rather than doing so sequentially, account after account, while cleaning
their data. This doesn't change much about the time the block takes to
complete, but it immediately prevents interaction with the blocked domain,
while up to now, it would only be guaranteed when the process ends.
2020-06-09 10:32:00 +02:00
384d64894a
Update “status” to “toot” for en.json ( #13877 )
2020-06-09 10:28:57 +02:00
db319c0fdc
Improve rendering of emoji which do not contrast with background ( #13772 )
...
* Refactor list of emoji requiring added outlines so that it can be theme-specific
* Split inaccessible emoji to emoji requiring an outline and ones that can be inverted
* Drop the “silouhettes” from black emoji as they seem to have changed color
* Add inaccessible emojis list for the light theme
* Use bordered emoji variant instead of unreliable CSS
2020-06-09 10:28:23 +02:00
ac3c83ef6f
Improve wording and add titles on moderated servers section in /about/more ( #13930 )
2020-06-09 10:28:02 +02:00
d890abfcab
Fix performance of follow import ( #13836 )
2020-06-09 10:26:58 +02:00
72a7cfaa39
Add e-mail-based sign in challenge for users with disabled 2FA ( #14013 )
2020-06-09 10:23:06 +02:00
8b6d97fb7c
Add limit parameter to rss ( #13743 )
2020-06-09 00:18:47 +02:00
13f065da05
Add visibility parameter in share page ( #13023 )
...
* Add visibility parameter in share page
* Restrict to default privacy
2020-06-09 00:16:30 +02:00
c66403b257
FIX: filters ignore media descriptions ( #13837 )
...
* FIX: filters ignore media descriptions
* remove parentheses to make codeclimate happy
* combine the text and run the regular expression only once.
https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581
* Fix use of “filter” instead of “compact”, fix coding style issues
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 00:11:42 +02:00
8e96510b25
Hide sensitive preview cards with blurhash ( #13985 )
...
* Use preview card blurhash in WebUI
* Handle sensitive preview cards
2020-06-06 17:41:56 +02:00
346d9b3d2e
Add blurhash to preview cards ( #13984 )
...
Fixes #13001
2020-06-05 23:10:41 +02:00
bf6745b9c3
Fix unpermitted operations on custom emojis leading to cryptic errors ( #13951 )
...
* Display appropriate error when performing unpermitted operation on custom emoji
Fixes #13897
* Remove links to custom emoji actions not performable by moderators
2020-06-05 15:23:27 +02:00
aed3a436a2
Fix serialization of replies when some of them are URIs ( #13957 )
...
* Fix serialization of replies when some of them are URIs
Fixes #13956
* Add test
2020-06-04 19:03:31 +02:00
f669b8bcce
Fix wrong route helper in encrypted messages controller ( #13952 )
...
And add `created_at` to encrypted message serializer
2020-06-03 20:32:15 +02:00
77619b1654
Put “Add new domain block” button on /admin/instances in header ( #13934 )
2020-06-03 20:19:14 +02:00
bf94934623
Fix account redirect confirmation message talking about moved followers ( #13950 )
...
Fixes #13949
2020-06-03 20:18:19 +02:00
643065799b
Fix activity not being signed ( #13948 )
2020-06-03 08:33:30 +02:00
5d8398c8b8
Add E2EE API ( #13820 )
2020-06-02 19:24:53 +02:00
f96a891853
Fix ref attr for react-textarea-autozsize ( #13936 )
2020-06-02 03:24:04 +02:00
c225ac8b9e
[Glitch] Adjust flash alert contrast for better readability
...
Port b4a8400afd
2020-06-01 18:31:45 +02:00
a8559458c3
[Glitch] Allow Ctrl-click to keep EmojiPicker window open
...
Port 64154c5161
2020-06-01 18:31:42 +02:00
89de02f7aa
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-01 18:21:43 +02:00
1f94f4009e
Improve appearance of notification cleaning UI
...
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
2020-06-01 12:28:27 +02:00
51ff679b9d
Fix admin page crashing when trying to block an invalid domain name ( #13884 )
...
* Fix admin page crashing when trying to block an invalid domain name
Fixes #13880
* Fix trailing and leading spaces not being properly stripped for domain blocks
2020-06-01 03:47:20 +02:00
eeddb1a624
Fix unsent toot confirmation dialog not popping up in single column ( #13888 )
2020-05-31 20:38:56 +02:00
b4a8400afd
Adjust flash alert contrast for better readability ( #13892 )
2020-05-31 20:35:18 +02:00
64154c5161
Allow Ctrl-click to keep EmojiPicker window open ( #13896 )
2020-05-31 20:34:34 +02:00
18f2c39074
Hide local-only pinned toots from public profiles
...
Fixes #1336
This also fixes federating pinned toots when some of them are local-only.
Public profiles will not show public toots, whether you are logged in
or not (this is consistent with local-only toots that are not pinned).
2020-05-31 17:20:15 +02:00
ddcd9fe9f0
Fix backup archive including outgoing-only content warnings
2020-05-30 18:27:00 +02:00
9e04b9d8df
Add support for setting Content Warning for CW-less outgoing toots
2020-05-30 18:27:00 +02:00
9707dbee6f
[Glitch] Fix timeline markers in Firefox
...
Port cc650bc023
2020-05-29 20:02:30 +02:00
9bd30b8dd5
[Glitch] Fix timeline markers not working on Chrome
...
Port 5aff2a6957
2020-05-29 20:02:30 +02:00
60b43050cb
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-29 19:27:21 +02:00
cc650bc023
Fix timeline markers in Firefox (regression from #13887 ) ( #13889 )
...
Unfortunately, Firefox does not support the `keepalive` parameter
I used in the previous PR. However it supports the `navigator.sendBeacon`
API that allows that kind of things, but does not allow setting headers.
Therefore, this PR replaces it with a `sendBeacon` call that passes the
bearer token in the POST data.
Doorkeeper will then handle the auth token out of the box, as long as
it is passed as form data. Passing the query as JSON does not work.
2020-05-29 19:25:57 +02:00
5aff2a6957
Fix timeline markers not working on Chrome ( #13887 )
...
* Periodically save timeline markers
This saves timeline markers immediately upon message arrival, but not more
than once every 5 minutes.
This does not change how the markers are saved on closing the window,
except that it avoids submitting them if there is no need for it.
* Use the Fetch API when possible instead of XHR on window unload
2020-05-29 16:14:16 +02:00
e8714530a4
Fix local-only hashtag columns
2020-05-28 15:21:16 +02:00
7a74e46b77
Fix one import being made on mastodon's codebase instead of glitch-soc's
2020-05-28 15:14:12 +02:00
0b01492276
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 40d81620b0
2020-05-28 14:08:05 +02:00
44ea965557
[Glitch] Fix local streaming of hashtag timelines
...
Port 3a1a21ad57
2020-05-28 14:05:21 +02:00
ef6bfaf12e
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-28 13:44:57 +02:00
ead09f5ddc
Fix exception when trying to serialize posts with <a> tags in them without hrefs ( #1334 )
...
* fix exception when trying to serialize posts with <a> tags in them without hrefs
* Add tests
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28 12:47:40 +02:00
c8cee24cb3
Fix Cmd-Enter not working to send toot
...
Fixes #1333
2020-05-26 10:15:35 +02:00
40d81620b0
Change wording from “Hide media” to “Hide image/images” in Web UI ( #13834 )
2020-05-25 12:30:34 +02:00
8e056bd82e
Fix csv upload ( #13835 )
2020-05-24 09:15:23 +02:00
e6706d171a
Fix searchable status without explicitly mentioning it ( #13829 )
2020-05-23 05:47:25 +02:00
3a1a21ad57
Fix local streaming of hashtag timelines ( #13827 )
2020-05-23 05:46:29 +02:00
b07c1e615b
Fix backup service when user has posted instance-local toots, again
2020-05-21 20:05:46 +02:00
27b5143dc4
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-20 18:22:42 +02:00
a319c1e60f
Add support for `summary` field for media description ( #13763 )
2020-05-15 17:08:59 +02:00
27ea7c13a5
Fix hashtag search performing account search as well ( #13758 )
2020-05-14 23:37:37 +02:00
71fce71c94
Fix webfinger returning wrong status code on malformed or missing param ( #13759 )
...
Fixes #13757
2020-05-14 23:28:06 +02:00
2b75728a80
[Glitch] Fix regression in sparkline style in web UI
...
Port c9dcc2d39f
2020-05-14 18:50:57 +02:00
f94aebafe5
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-14 18:49:10 +02:00
c9dcc2d39f
Fix regression in sparkline style in web UI ( #13753 )
2020-05-14 09:01:23 +02:00
d147dd7588
[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted
...
Port 92f85bea52
2020-05-13 23:17:10 +02:00
ef2f98317a
[Glitch] Fix some account avatars on public pages having incorrect size
...
Port 48503384d0
2020-05-13 23:17:10 +02:00
6a17fa2b99
[Glitch] Fix first poll option not being focused when adding a poll
...
Port af6d356279
2020-05-13 23:17:10 +02:00
af53cfd19e
New Crowdin translations ( #13398 )
...
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations activerecord.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations devise.en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations activerecord.en.yml (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations devise.en.yml (Estonian)
[ci skip]
* New translations activerecord.en.yml (Estonian)
[ci skip]
* New translations devise.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Kazakh)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations activerecord.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Greek)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations devise.en.yml (Danish)
[ci skip]
* New translations activerecord.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations activerecord.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations activerecord.en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations devise.en.yml (Basque)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Portuguese)
[ci skip]
* New translations devise.en.yml (Polish)
[ci skip]
* New translations activerecord.en.yml (Polish)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Finnish)
[ci skip]
* New translations activerecord.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Italian)
[ci skip]
* New translations activerecord.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations activerecord.en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Finnish)
[ci skip]
* New translations devise.en.yml (Corsican)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations devise.en.yml (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations devise.en.yml (Sardinian)
[ci skip]
* New translations doorkeeper.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2020-05-13 22:35:20 +02:00
3baacf6993
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-13 22:11:49 +02:00
92f85bea52
Change “hide/show boosts from …” menu to be hidden when the account is muted ( #13748 )
...
Otherwise, it may mislead users into believing this setting is an
exception to the muting behavior.
Fixes #13744
2020-05-13 21:20:45 +02:00
48503384d0
Fix some account avatars on public pages having incorrect size ( #13692 )
...
* Fix some account avatars on public pages having incorrect size
* Remove outdated and overridden width and height attributes
* Remove more hardcoded width/height attributes
2020-05-13 21:20:34 +02:00
706972b4ba
Fix RedownloadMediaWorker ( #13741 )
2020-05-12 15:55:25 +02:00
af6d356279
Fix first poll option not being focused when adding a poll ( #13740 )
...
Fixes #13698
2020-05-12 15:29:44 +02:00
5daae6dc61
Fix keybase config serializer ( #13742 )
2020-05-12 15:28:29 +02:00
78202e9138
Bump doorkeeper from 5.3.3 to 5.4.0 ( #13733 )
...
* Bump doorkeeper from 5.3.3 to 5.4.0
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.3.3 to 5.4.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Fix tests
* Fix use of Doorkeeper::AccessToken.find_or_create_for
* Fix tests?
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-05-12 15:25:33 +02:00
d8bad8fbf6
Fix not publishing update of remote timeline ( #13745 )
...
* Fix not publishing update of remote timeline
* fix @ missing
* if/unless to if/else
2020-05-12 15:24:35 +02:00
4bcef12bad
Fix sr locale being selected over sr-Latn ( #13693 )
...
* Fix sr locale being selected over sr-Latn
* Update tests
2020-05-11 01:09:21 +02:00
559214c33f
[Glitch] Add remote only to public timeline
...
Port 26b08a3c54
2020-05-10 16:19:59 +02:00
51508e5061
[Glitch] Fix use of inline CSS in public pages
...
Port c0b849bdfd
2020-05-10 16:19:59 +02:00
4a70792b4a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just a glitch-soc-only dependency too close to a
dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
Not a real conflict, just a change too close to glitch-soc-changed code
for optionally showing boosts in public timelines.
Applied upstream changes.
- `app/views/layouts/application.html.haml`:
Upstream a new, static CSS file, conflict due to glitch-soc's theming
system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
4b766f9846
Refactor monkey-patching of Goldfinger ( #12561 )
2020-05-10 11:41:43 +02:00
4a2ea2e51b
Add `vi` to available locales ( #13542 )
...
* Enable selecting Vietnamese language in Admin Dashboard
* Update settings_helper.rb
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-05-10 11:25:35 +02:00
8be4c2ba21
Add ability to remove identity proofs from account ( #13682 )
...
Fix #12613
2020-05-10 11:21:10 +02:00
26b08a3c54
Add remote only to public timeline ( #13504 )
...
* Add remote only to public timeline
* Fix code style
2020-05-10 10:36:18 +02:00
e9ecbca70d
Fix error within error when limiting backtrace to 3 lines ( #13120 )
...
Fix #13086 , close #13113
2020-05-10 10:30:27 +02:00
45202f79ef
Remove confusing “You are already signed in.” flash message ( #13547 )
...
When attempting to access the log-in page while already logged in,
Devise's `require_no_authentication` kicks in and sets a flash
message “You are already signed in.”
In almost all cases, this also causes a redirect to /web, which
does not display or clear flash messages, thus leaving the message
to a potentially much later date, like for instance, accessing
/preferences several minutes after being redirected to /web.
2020-05-10 10:16:39 +02:00
a4240fd027
Improve RSS entries for statuses ( #13592 )
...
* Improve RSS entries for statuses
- Render polls in both accounts and tags serializers
- Refactor RSS serializers
- Change title preview to include ellipsis when truncated
- Change title preview to show CW instead of toot text
- Add tests
* Remove title from OEmbed serialization
Twitter doesn't serialize title either, and tihs allows us to move the
title formatting code to the RSS serializers.
2020-05-10 09:50:54 +02:00
c6ff4c634c
Fix crash when invalid addresses are linked in HTML or Markdown toots
2020-05-09 16:01:00 +02:00
e1629a7758
Remove 'unsafe-inline' from Content-Security-Policy style-src ( #13679 )
...
* Make sure wicg-inert doesn't rely on inline CSS
* Remove unsafe-inline from style-src
2020-05-08 21:22:57 +02:00
0d62e09707
Fix failing jest test ( #13681 )
2020-05-08 21:21:57 +02:00
f1e0fa80f6
Fix own following/followers not showing muted users ( #13614 )
...
Fixes #13612
2020-05-08 20:36:34 +02:00
6748a5acb1
Fix followings list order | Issue #13538 ( #13676 )
2020-05-08 20:17:16 +02:00
5cff7910c2
Add more ActivityPub controller tests ( #13590 )
2020-05-03 22:19:24 +02:00
c0b849bdfd
Fix use of inline CSS in public pages ( #13576 )
...
Change `account_link_to` to use an image tag rather than some
inline CSS. Dropped the `size` parameter in the process, but it wasn't
used for anything except the default value of 36px.
Dropped CSS rules that were always overriden, and defaulted to 36px width
and height instead.
2020-05-03 22:04:18 +02:00
89fcd68b75
[Glitch] Fix admin-facing uses of inline CSS
...
Port b8ba977497
2020-05-03 21:47:58 +02:00
7ea8b07b93
[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus
...
Port 77ec0875ea
2020-05-03 21:47:11 +02:00
9e5a216878
[Glitch] Fix end-user-facing uses of inline CSS
...
Port 0e362b7678
2020-05-03 21:44:43 +02:00
4a5f93c25f
[Glitch] Refactor/cleanup TIMELINE_DELETE-related code
...
Port ad9c7aefe6
2020-05-03 21:42:13 +02:00
502a0365df
[Glitch] Fix messed up z-index when NoScript blocks media/previews
...
Port 04eb599864
2020-05-03 21:41:15 +02:00
Thibaut Girka
Ben Lubar
Yamagishi Kazutoshi
Bei Li
Mélanie Chauvel
Takeshi Umeda
Eugen Rochko
Christopher Choi
Brian C. Lindner
Ben Lubar
dependabot-preview[bot]
taicv
Taras Gogol