lain
3b3cf63118
Emoji: Add test for ZWJ sequence emoji
4 years ago
Egor Kislitsyn
c9afb350e7
Document follow relationship updates and cleanup
4 years ago
lain
b6f5e9ac9c
Emoji: Remove unused emoji-data.txt
4 years ago
lain
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
4 years ago
lain
5d15486098
SideEffects: fix test
4 years ago
lain
04af0bbe44
User: Remove left-over (wrong) fix.
4 years ago
lain
222312900e
User: Don't allow local users in remote changesets
4 years ago
Mark Felder
45949b5cd3
Update Linkify to 0.4.0
4 years ago
Egor Kislitsyn
35ba48494f
Stream follow updates
4 years ago
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
4 years ago
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
4 years ago
Ivan Tashkinov
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
4 years ago
Ivan Tashkinov
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
Haelwenn
5a5ff508aa
Merge branch '2727-gitlab-issues' into 'develop'
...
Gitlab-CI: Explicitly tag specified arm32 images.
Closes #2327
See merge request pleroma/pleroma!3178
4 years ago
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.
4 years ago
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
4 years ago
Alexander Strizhakov
6aadb1cb40
digest algorithm is taken from header
4 years ago
rinpatch
bb522bcc44
Merge branch 'removing-fed-sockets-settings' into 'develop'
...
Removing remaining fed sockets settings
See merge request pleroma/pleroma!3177
4 years ago
Alexander Strizhakov
94480c6607
removing fed sockets settings
4 years ago
feld
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
4 years ago
Maksim Pechnikov
fb72f2034a
fix spec
4 years ago
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
4 years ago
Ivan Tashkinov
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
4 years ago
rinpatch
7a8be68241
Merge branch 'fix/2323-release-configuration-provider' into 'develop'
...
Fix for elixir 1.11
Closes #2323
See merge request pleroma/pleroma!3173
4 years ago
Alexander Strizhakov
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
4 years ago
rinpatch
c2bf67644e
Merge branch 'features/ruby-elements' into 'develop'
...
scrubbers/default: Add ruby element and it's childs
See merge request pleroma/pleroma!3172
4 years ago
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/
4 years ago
Haelwenn
ddf2314836
Merge branch 'chore/jason-in-tests' into 'develop'
...
Use Jason instead of Poison in tests
See merge request pleroma/pleroma!3171
4 years ago
Mark Felder
54df44d380
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters
4 years ago
Mark Felder
3283d0805f
Use Jason instead of Poison in tests
4 years ago
rinpatch
1ab61953db
Merge branch 'chore/bump-linkify' into 'develop'
...
[#2293 ] Update Linkify to 0.3.0
See merge request pleroma/pleroma!3170
4 years ago
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
4 years ago
rinpatch
12bdced845
Merge branch 'websearch' into 'develop'
...
Use `websearch_to_tsvector` by default
See merge request pleroma/pleroma!3163
4 years ago
lain
67b15cc033
Search: Save detected pg version in a persistent term.
4 years ago
lain
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Haelwenn
e07f8f8aa5
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3167
4 years ago
feld
15550f7c4b
Merge branch 'cherry-pick-a65fc78c' into 'stable'
...
Dockerfile fixes for stable
See merge request pleroma/pleroma!3169
4 years ago
Michael Walker
9b7ade6568
Install file-dev in Dockerfile build stage
...
This is required by the majic, added in #2534 .
4 years ago
feld
22f85e0570
Merge branch 'libmagic' into 'develop'
...
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
(cherry picked from commit a65fc78c6a
)
e6af7dc7
Add missing libmagic for image upload
4 years ago
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/
4 years ago
feld
a65fc78c6a
Merge branch 'libmagic' into 'develop'
...
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
4 years ago
Guy Sheffer
e6af7dc777
Add missing libmagic for image upload
4 years ago
Ivan Tashkinov
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
4 years ago
Alex Gleason
4999efad3f
Update CHANGELOG.md: registration workflow
4 years ago
Alex Gleason
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
feld
9fc3356a06
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
...
Merge branch 'revert-da4660d2' into 'stable'
See merge request pleroma/pleroma!3166
4 years ago
feld
ba3bf16c70
Merge branch 'revert-da4660d2' into 'develop'
...
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
(cherry picked from commit 8a7ee9fe74
)
42ff5ea9
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
4 years ago