Commit Graph

12086 Commits

Author SHA1 Message Date
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 [] 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 
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 .
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 

(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 
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 

(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 
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 

See merge request 
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 
2020-11-05 16:23:56 +03:00
feld
86b4149a13 Merge branch '1668-prometheus-access-restrictions' into 'develop'
[] App metrics endpoint (Prometheus) access restrictions

Closes 

See merge request 
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 

See merge request 
2020-11-05 16:19:44 +03:00
feld
88dc1d24b9 Merge branch 'issue/2261' into 'develop'
[] FrontStatic plug: excluded invalid url

See merge request 
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 

See merge request 
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 
2020-11-04 17:05:21 +03:00
feld
49b43e668e Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes 

See merge request 
2020-11-04 17:00:50 +03:00
feld
fa6ad67397 Merge branch 'tesla-get-to-pleroma' into 'develop'
Use Pleroma.HTTP instead of Tesla

Closes 

See merge request 
2020-11-04 16:57:37 +03:00
rinpatch
fb0e340363 Rip out fedsockets from the release branch 2020-10-21 21:14:58 +03:00
rinpatch
274c8e6fab SECURITY.md: update supported versions to only 2.2 2020-10-15 21:45:31 +03:00
rinpatch
6c1bc9ca39 CHANGELOG.md: prepare 2.2.0 changelog 2020-10-15 21:43:46 +03:00
rinpatch
65b73eb9fd mix.exs: bump version to 2.2.0 2020-10-15 21:43:35 +03:00
feld
b48724afcd Merge branch 'docs-indigenous' into 'develop'
Change handle and url of contact person for Indigenous client

See merge request 
2020-10-14 20:31:23 +00:00