lain
f64237927c
Merge branch 'release/2.2.1' into 'stable'
Release/2.2.1
See merge request pleroma/pleroma!3214
pirms 3 gadiem
lain
843d2074fe
Fixtures: Add application actor fixture.
pirms 3 gadiem
lain
5ada38499b
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
pirms 3 gadiem
lain
322463e1bd
Update changelog
pirms 3 gadiem
lain
463eec992a
Apply 1 suggestion(s) to 1 file(s)
pirms 3 gadiem
lain
68eed0873e
Linting
pirms 3 gadiem
lain
d4e6ca88a6
Update frontend
pirms 3 gadiem
lain
b988e9cc8b
Mix: Update version.
pirms 3 gadiem
lain
a8ca282b4a
Update changelog
pirms 3 gadiem
lain
d788b41c2e
Report fixes.
pirms 3 gadiem
lain
0f527c9e02
Mix: Update linkify to 0.4.1
pirms 3 gadiem
Ivan Tashkinov
5cfa32cb50
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
pirms 3 gadiem
Alexander Strizhakov
897b62091b
fix for elixir 1.11
load runtime configs in releases with config provider
pirms 3 gadiem
lain
c26583c99e
SideEffects: fix test
pirms 3 gadiem
lain
41d6225e2e
User: Remove left-over (wrong) fix.
pirms 3 gadiem
lain
a32e13e6c4
User: Don't allow local users in remote changesets
pirms 3 gadiem
Mark Felder
c10783087f
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
pirms 3 gadiem
lain
66c75b0192
Update changelog
pirms 3 gadiem
lain
29c3c35ba1
Search: Only skip ordering the rum index.
pirms 3 gadiem
lain
3388bf9c9b
Activity search: Fix order of results
Greatly speeds up the search for RUM.
pirms 3 gadiem
Mark Felder
42a386eb9f
Document fixing the pleroma.user delete_activities mix task
pirms 3 gadiem
Mark Felder
a21aeeee12
Need to start web_resp cache or mix task fails
pirms 3 gadiem
Mark Felder
93852f1b42
Document S3 and Elixir 1.11 compat fix
pirms 3 gadiem
Mark Felder
012108a299
Fix S3 uploads with Elixir 1.11
pirms 3 gadiem
Haelwenn (lanodan) Monnier
aa848cbd75
pleroma.instance: Fix Exiftool module name
pirms 3 gadiem
Alexander Strizhakov
065009a57a
remove PurgeExpiredActivity from Oban db config
pirms 3 gadiem
feld
15550f7c4b
Merge branch 'cherry-pick-a65fc78c' into 'stable'
Dockerfile fixes for stable
See merge request pleroma/pleroma!3169
pirms 3 gadiem
Michael Walker
9b7ade6568
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534 .
pirms 3 gadiem
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
pirms 3 gadiem
feld
9fc3356a06
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
Merge branch 'revert-da4660d2' into 'stable'
See merge request pleroma/pleroma!3166
pirms 3 gadiem
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'"
pirms 3 gadiem
Mark Felder
3e7642b123
Update AdminFE build to pleroma/admin-fe@c18f167a124c31ab2e1dfbf432ac482b17c01cbd
pirms 3 gadiem
rinpatch
6e7963cca1
Merge branch 'build-release/fix-release-builds' into 'stable'
.gitlab-ci.yml: Add libmagic to installed packages for OTP releases
See merge request pleroma/pleroma!3134
pirms 3 gadiem
rinpatch
3a6aa103d3
.gitlab-ci.yml: Add libmagic to installed packages for OTP releases
pirms 3 gadiem
rinpatch
1172844ed1
Merge branch 'release/2.2.0' into 'stable'
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
pirms 3 gadiem
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88b
pirms 3 gadiem
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
pirms 3 gadiem
Alexander Strizhakov
e58ea7f99c
changes after rebase
pirms 3 gadiem
rinpatch
6166ecdbc8
CHANGELOG.md: Add an entry for the spoofing fix
pirms 3 gadiem
rinpatch
5116859f0e
Merge branch 'fix/object-attachment-spoof' into 'develop'
Fix object spoofing vulnerability in attachments
See merge request pleroma/secteam/pleroma!18
pirms 3 gadiem
Haelwenn
4d693b5e54
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
pirms 3 gadiem
Mark Felder
79caf3840e
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
pirms 3 gadiem
feld
48f7e12e6c
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
pirms 3 gadiem
feld
86b4149a13
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
pirms 3 gadiem
rinpatch
5f27a39152
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
pirms 3 gadiem
feld
88dc1d24b9
Merge branch 'issue/2261' into 'develop'
[#2261 ] FrontStatic plug: excluded invalid url
See merge request pleroma/pleroma!3106
pirms 3 gadiem
rinpatch
7058cac1c2
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
pirms 3 gadiem
feld
6c8469664a
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
pirms 3 gadiem
feld
49b43e668e
Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
pirms 3 gadiem
feld
fa6ad67397
Merge branch 'tesla-get-to-pleroma' into 'develop'
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
pirms 3 gadiem