summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-30[#3112] Allowed revoking same-user token from any apps. Added tests.Ivan Tashkinov
2020-11-28Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-28OAuth form user remembering feature. Local MastoFE login / logout fixes.Ivan Tashkinov
2020-11-27Merge branch '2727-gitlab-issues' into 'develop'Haelwenn
Gitlab-CI: Explicitly tag specified arm32 images. Closes #2327 See merge request pleroma/pleroma!3178
2020-11-27Gitlab-CI: Explicitly tag specified arm32 images.lain
So we don't accidentally run generic images on runners that only can deal with specific images.
2020-11-27Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'lain
Digest algorithm is taken from header Closes #2322 See merge request pleroma/pleroma!3176
2020-11-27digest algorithm is taken from headerAlexander Strizhakov
2020-11-26Merge branch 'removing-fed-sockets-settings' into 'develop'rinpatch
Removing remaining fed sockets settings See merge request pleroma/pleroma!3177
2020-11-26removing fed sockets settingsAlexander Strizhakov
2020-11-25Merge branch 'fix/mix-debug' into 'develop'feld
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env See merge request pleroma/pleroma!3175
2020-11-25fix specMaksim Pechnikov
2020-11-25Prevent mix tasks from spewing any internal logging unless DEBUG is in the envMark Felder
e.g., DEBUG=1 mix pleroma.config migrate_from_db
2020-11-25Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-25Session token setting on token exchange. Auth-related refactoring.Ivan Tashkinov
2020-11-25Merge branch 'fix/2323-release-configuration-provider' into 'develop'rinpatch
Fix for elixir 1.11 Closes #2323 See merge request pleroma/pleroma!3173
2020-11-25fix for elixir 1.11Alexander Strizhakov
load runtime configs in releases with config provider
2020-11-25Merge branch 'features/ruby-elements' into 'develop'rinpatch
scrubbers/default: Add ruby element and it's childs See merge request pleroma/pleroma!3172
2020-11-25scrubbers/default: Add ruby element and it's childsHaelwenn (lanodan) Monnier
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-24Merge branch 'chore/jason-in-tests' into 'develop'Haelwenn
Use Jason instead of Poison in tests See merge request pleroma/pleroma!3171
2020-11-23Fix badly formatted JSON fixtures which causes Jason to erroneously detect ↵Mark Felder
control characters
2020-11-23Use Jason instead of Poison in testsMark Felder
2020-11-23Merge branch 'chore/bump-linkify' into 'develop'rinpatch
[#2293] Update Linkify to 0.3.0 See merge request pleroma/pleroma!3170
2020-11-23Update Linkify to 0.3.0Mark Felder
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-23Merge branch 'websearch' into 'develop'rinpatch
Use `websearch_to_tsvector` by default See merge request pleroma/pleroma!3163
2020-11-23Search: Save detected pg version in a persistent term.lain
2020-11-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearchlain
2020-11-23Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3167
2020-11-21Merge branch 'cherry-pick-a65fc78c' into 'stable'feld
Dockerfile fixes for stable See merge request pleroma/pleroma!3169
2020-11-21Install file-dev in Dockerfile build stageMichael Walker
This is required by the majic, added in #2534.
2020-11-21Merge branch 'libmagic' into 'develop'feld
Add missing libmagic for image upload to dockerfile See merge request pleroma/pleroma!3168 (cherry picked from commit a65fc78c6a14e1333ce71d28824a490a8a6da69b) e6af7dc7 Add missing libmagic for image upload
2020-11-21Translated using Weblate (Hebrew)Guy Sheffer
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-21Merge branch 'libmagic' into 'develop'feld
Add missing libmagic for image upload to dockerfile See merge request pleroma/pleroma!3168
2020-11-21Add missing libmagic for image uploadGuy Sheffer
2020-11-21Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-21Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.Ivan Tashkinov
2020-11-21Update CHANGELOG.md: registration workflowAlex Gleason
2020-11-21Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason
2020-11-20Merge branch 'cherry-pick-8a7ee9fe' into 'stable'feld
Merge branch 'revert-da4660d2' into 'stable' See merge request pleroma/pleroma!3166
2020-11-20Merge branch 'revert-da4660d2' into 'develop'feld
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" See merge request pleroma/pleroma!3158 (cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b) 42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
2020-11-20Merge branch 'fix/2302-report-duplicates' into 'develop'feld
Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146
2020-11-20Linting.lain
2020-11-20Config, Docs: Remove search_functionlain
2020-11-20SearchController Test: Fix test.lain
2020-11-20Changelog: Add info about search changeslain
2020-11-20Search: Change search method based on detected pg versionlain
2020-11-20Application: Save postgres version in the environmentlain
2020-11-20Merge branch 'fix/mix-tasks' into 'develop'lain
Start limiters in mix tasks Closes #2320 See merge request pleroma/pleroma!3165
2020-11-20start limiters in mix tasksAlexander Strizhakov
2020-11-19Merge branch '2301-users-search-discoverability-fix' into 'develop'feld
[#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162
2020-11-19Merge branch 'oban-jobs-to-simple-tasks' into 'develop'feld
Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-12 03:04:29 +0000