nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
12093 commits 2 branches 0 tags 272 MiB
Commit graph

12093 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 3dc04b9aca Merge branch 'fix/missing_emoji_steal_dir' into 'develop' 
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
 2021-01-18 15:28:19 +03:00
Alexander Strizhakov 197606984d update for retired elixir_make package version 2021-01-17 15:24:04 +03:00
lain f64237927c Merge branch 'release/2.2.1' into 'stable' 
Release/2.2.1

See merge request pleroma/pleroma!3214
 2020-12-23 13:35:41 +00:00
lain 843d2074fe Fixtures: Add application actor fixture. 2020-12-23 11:56:08 +01:00
lain 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1 2020-12-23 11:40:34 +01:00
lain 322463e1bd Update changelog 2020-12-23 11:39:19 +01:00
lain 463eec992a Apply 1 suggestion(s) to 1 file(s) 2020-12-23 10:35:41 +00:00
lain 68eed0873e Linting 2020-12-23 11:16:13 +01:00
lain d4e6ca88a6 Update frontend 2020-12-23 09:35:19 +01:00
lain b988e9cc8b Mix: Update version. 2020-12-22 22:11:02 +01:00
lain a8ca282b4a Update changelog 2020-12-22 21:54:31 +01:00
lain d788b41c2e Report fixes. 2020-12-22 21:32:11 +01:00
lain 0f527c9e02 Mix: Update linkify to 0.4.1 2020-12-22 21:22:48 +01:00
Ivan Tashkinov 5cfa32cb50 [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results. 2020-12-22 21:16:37 +01:00
Alexander Strizhakov 897b62091b fix for elixir 1.11 
load runtime configs in releases with config provider
 2020-12-22 21:08:44 +01:00
lain c26583c99e SideEffects: fix test 2020-12-22 21:08:11 +01:00
lain 41d6225e2e User: Remove left-over (wrong) fix. 2020-12-22 21:08:04 +01:00
lain a32e13e6c4 User: Don't allow local users in remote changesets 2020-12-22 21:07:56 +01:00
Mark Felder c10783087f Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-22 21:06:36 +01:00
lain 66c75b0192 Update changelog 2020-12-22 21:05:12 +01:00
lain 29c3c35ba1 Search: Only skip ordering the rum index. 2020-12-22 21:03:19 +01:00
lain 3388bf9c9b Activity search: Fix order of results 
Greatly speeds up the search for RUM.
 2020-12-22 21:03:01 +01:00
Mark Felder 42a386eb9f Document fixing the pleroma.user delete_activities mix task 2020-12-22 20:51:24 +01:00
Mark Felder a21aeeee12 Need to start web_resp cache or mix task fails 2020-12-22 20:49:16 +01:00
Mark Felder 93852f1b42 Document S3 and Elixir 1.11 compat fix 2020-12-22 20:48:56 +01:00
Mark Felder 012108a299 Fix S3 uploads with Elixir 1.11 2020-12-22 20:48:49 +01:00
Haelwenn (lanodan) Monnier aa848cbd75 pleroma.instance: Fix Exiftool module name 2020-12-22 20:48:19 +01:00
Alexander Strizhakov 065009a57a remove PurgeExpiredActivity from Oban db config 2020-12-22 20:47:20 +01:00
feld 15550f7c4b Merge branch 'cherry-pick-a65fc78c' into 'stable' 
Dockerfile fixes for stable

See merge request pleroma/pleroma!3169
 2020-11-21 18:29:26 +00:00
Michael Walker 9b7ade6568 Install file-dev in Dockerfile build stage 
This is required by the majic, added in #2534.
 2020-11-21 12:17:50 -06:00
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
 2020-11-21 18:12:33 +00:00
feld 9fc3356a06 Merge branch 'cherry-pick-8a7ee9fe' into 'stable' 
Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166
 2020-11-20 21:40:23 +00:00
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'"
 2020-11-20 21:30:04 +00:00
Mark Felder 3e7642b123 Update AdminFE build to pleroma/admin-fe@c18f167a12 2020-11-18 14:42:16 -06:00
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
 2020-11-12 14:38:49 +00:00
rinpatch 3a6aa103d3 .gitlab-ci.yml: Add libmagic to installed packages for OTP releases 2020-11-12 16:14:15 +03:00
rinpatch 1172844ed1 Merge branch 'release/2.2.0' into 'stable' 
Release/2.2.0

See merge request pleroma/secteam/pleroma!19
 2020-11-12 12:34:48 +00:00
rinpatch b4c6b262d6 pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad 2020-11-11 23:28:15 +03:00
rinpatch 99edfba3da Polish the changelog a bit and specify release date 2020-11-11 23:12:52 +03:00
Alexander Strizhakov e58ea7f99c changes after rebase 2020-11-11 11:42:52 +03:00
rinpatch 6166ecdbc8 CHANGELOG.md: Add an entry for the spoofing fix 2020-11-05 16:33:51 +03:00
rinpatch 5116859f0e Merge branch 'fix/object-attachment-spoof' into 'develop' 
Fix object spoofing vulnerability in attachments

See merge request pleroma/secteam/pleroma!18
 2020-11-05 16:32:54 +03:00
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
 2020-11-05 16:32:50 +03:00
Mark Felder 79caf3840e phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+ 2020-11-05 16:26:10 +03:00
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
 2020-11-05 16:23:56 +03:00
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
 2020-11-05 16:22:35 +03:00
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
 2020-11-05 16:19:44 +03:00
feld 88dc1d24b9 Merge branch 'issue/2261' into 'develop' 
[#2261] FrontStatic plug: excluded invalid url

See merge request pleroma/pleroma!3106
 2020-11-05 16:18:56 +03:00
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
 2020-11-04 17:12:37 +03:00
feld 6c8469664a Merge branch 'chore/elixir-1.11' into 'develop' 
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
 2020-11-04 17:05:21 +03:00