lain
a0aece3223
Changelog: Update changelog
2020-12-02 16:52:44 +01:00
lain
ab2610b703
Docs: Add info about RGI emoji
2020-12-02 16:49:38 +01:00
lain
8fb259e739
Emoji: Only accept RGI emoji.
...
"recommended for general interchange"
2020-12-02 16:46:19 +01:00
lain
3b3cf63118
Emoji: Add test for ZWJ sequence emoji
2020-12-02 16:18:08 +01:00
Egor Kislitsyn
c9afb350e7
Document follow relationship updates and cleanup
2020-12-02 19:16:36 +04:00
lain
b6f5e9ac9c
Emoji: Remove unused emoji-data.txt
2020-12-02 16:15:31 +01:00
lain
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
2020-12-02 16:15:03 +01:00
lain
5d15486098
SideEffects: fix test
2020-12-02 14:48:11 +01:00
lain
04af0bbe44
User: Remove left-over (wrong) fix.
2020-12-02 13:39:29 +01:00
lain
222312900e
User: Don't allow local users in remote changesets
2020-12-02 12:18:43 +01:00
Mark Felder
45949b5cd3
Update Linkify to 0.4.0
2020-12-01 17:26:25 -06:00
Egor Kislitsyn
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
rinpatch
57d0379b89
Merge branch 'fix/search-test-on-exit' into 'develop'
...
Search tests: Use on_exit for restoring `persistent_term` state
See merge request pleroma/pleroma!3182
2020-12-01 17:08:05 +00:00
rinpatch
fc9ebe5073
Search tests: Use on_exit for restoring persistent_term
state
...
Otherwise if the assertion failed, the code below which resets the
state would never be reached
2020-12-01 19:45:25 +03:00
Ivan Tashkinov
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
2020-11-30 21:55:48 +03:00
Ivan Tashkinov
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-28 21:51:27 +03:00
Ivan Tashkinov
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
Haelwenn
5a5ff508aa
Merge branch '2727-gitlab-issues' into 'develop'
...
Gitlab-CI: Explicitly tag specified arm32 images.
Closes #2327
See merge request pleroma/pleroma!3178
2020-11-27 14:20:59 +00:00
lain
6db710c9ba
Gitlab-CI: Explicitly tag specified arm32 images.
...
So we don't accidentally run generic images on runners
that only can deal with specific images.
2020-11-27 13:27:35 +01:00
lain
14a2c1da13
Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'
...
Digest algorithm is taken from header
Closes #2322
See merge request pleroma/pleroma!3176
2020-11-27 11:51:24 +00:00
Alexander Strizhakov
6aadb1cb40
digest algorithm is taken from header
2020-11-27 08:10:52 +03:00
rinpatch
bb522bcc44
Merge branch 'removing-fed-sockets-settings' into 'develop'
...
Removing remaining fed sockets settings
See merge request pleroma/pleroma!3177
2020-11-26 15:35:22 +00:00
Alexander Strizhakov
94480c6607
removing fed sockets settings
2020-11-26 17:39:38 +03:00
2b4e355522
Merge branch 'fix/mix-debug' into 'develop'
...
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
See merge request pleroma/pleroma!3175
2020-11-25 23:59:52 +00:00
Maksim Pechnikov
fb72f2034a
fix spec
2020-11-25 22:44:27 +03:00
Mark Felder
751712d970
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
...
e.g., DEBUG=1 mix pleroma.config migrate_from_db
2020-11-25 12:52:39 -06:00
Ivan Tashkinov
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-25 21:48:18 +03:00
Ivan Tashkinov
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
2020-11-25 21:47:23 +03:00
rinpatch
7a8be68241
Merge branch 'fix/2323-release-configuration-provider' into 'develop'
...
Fix for elixir 1.11
Closes #2323
See merge request pleroma/pleroma!3173
2020-11-25 11:57:13 +00:00
Alexander Strizhakov
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
2020-11-25 14:10:24 +03:00
rinpatch
c2bf67644e
Merge branch 'features/ruby-elements' into 'develop'
...
scrubbers/default: Add ruby element and it's childs
See merge request pleroma/pleroma!3172
2020-11-25 08:30:58 +00:00
Haelwenn (lanodan) Monnier
3cfc20083e
scrubbers/default: Add ruby element and it's childs
...
This allows to format Japanese furigana (aka ruby) notation.
Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.
See https://www.w3.org/TR/ruby/
2020-11-25 00:40:21 +01:00
Haelwenn
ddf2314836
Merge branch 'chore/jason-in-tests' into 'develop'
...
Use Jason instead of Poison in tests
See merge request pleroma/pleroma!3171
2020-11-24 12:17:09 +00:00
Mark Felder
54df44d380
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters
2020-11-23 14:48:14 -06:00
Mark Felder
3283d0805f
Use Jason instead of Poison in tests
2020-11-23 13:28:55 -06:00
rinpatch
1ab61953db
Merge branch 'chore/bump-linkify' into 'develop'
...
[#2293 ] Update Linkify to 0.3.0
See merge request pleroma/pleroma!3170
2020-11-23 17:37:27 +00:00
Mark Felder
60c8c5402c
Update Linkify to 0.3.0
...
Added
- Support returning result as iodata and as safe iodata
Fixed
- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
2020-11-23 11:22:50 -06:00
rinpatch
12bdced845
Merge branch 'websearch' into 'develop'
...
Use `websearch_to_tsvector` by default
See merge request pleroma/pleroma!3163
2020-11-23 14:40:33 +00:00
lain
67b15cc033
Search: Save detected pg version in a persistent term.
2020-11-23 15:29:55 +01:00
lain
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-23 15:18:19 +01:00
Haelwenn
e07f8f8aa5
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3167
2020-11-23 13:43:57 +00:00
Guy Sheffer
d5f5d01495
Translated using Weblate (Hebrew)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
2020-11-21 18:12:07 +00:00
a65fc78c6a
Merge branch 'libmagic' into 'develop'
...
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
2020-11-21 18:11:58 +00:00
Guy Sheffer
e6af7dc777
Add missing libmagic for image upload
2020-11-21 19:57:38 +02:00
Ivan Tashkinov
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-21 19:47:46 +03:00
Ivan Tashkinov
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
2020-11-21 19:47:25 +03:00
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
lain
e4289792d2
Linting.
2020-11-20 16:38:05 +01:00
lain
25a03a9b5b
Config, Docs: Remove search_function
2020-11-20 16:33:11 +01:00
lain
8532325d65
SearchController Test: Fix test.
2020-11-20 16:29:11 +01:00