sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,692 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

6692 Commits

Author SHA1 Message Date
rinpatch ecb3386f93 Merge branch 'release/1.1.7' into 'stable' 
Release/1.1.7

See merge request pleroma/pleroma!2065
 2019-12-14 15:01:09 +00:00
rinpatch 3b407a9a29 remove a random test 
it's was already removed from develop in 4e53520917
 2019-12-13 22:47:39 +03:00
rinpatch 3ecdd13bb2 Add Kocaptcha endpoint to the test config 2019-12-13 22:24:26 +03:00
rinpatch 703e5829dd .gitlab-ci.yml: bump rum postgres to non-bugged version and disable 
--trace
 2019-12-13 22:15:08 +03:00
rinpatch f38fb42e30 mix.exs: bump version to 1.1.7 2019-12-13 22:09:14 +03:00
rinpatch ec6cc876bc changelog: add entry for bundled pleroma-fe changes on 1.1.7 2019-12-13 22:08:45 +03:00
rinpatch f393975123 pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7b 2019-12-13 22:03:24 +03:00
rinpatch 9fad30f553 changelog: entry for 1.1.7 2019-12-13 21:58:06 +03:00
Egor Kislitsyn bf9d631fca Add native captcha and enable it by default. 2019-12-13 21:30:11 +03:00
href 865cd2c7c4 report federating status in nodeinfo 2019-12-13 21:20:09 +03:00
rinpatch 66563f93fd Set better Cache-Control header for static content 
Closes #1382
 2019-12-13 21:19:55 +03:00
rinpatch b7370ab513 OTP releases: only set name and distribution type if not set already 
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
 2019-12-13 21:16:45 +03:00
rinpatch 2199d15000 OTP: Fix runtime upload limit config being ignored 
Closes #1109
 2019-12-13 21:16:26 +03:00
rinpatch 0ba3f1ffb2 Merge branch 'release/1.1.6' into 'stable' 
Release/1.1.6

See merge request pleroma/pleroma!1995
 2019-11-19 20:04:19 +00:00
rinpatch 34206e4d7f changelog: fix wrong header levels 2019-11-19 19:47:03 +03:00
rinpatch c2e9c1c8a5 bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 2019-11-19 19:45:20 +03:00
rinpatch b24b848057 mix.exs: bump version to 1.1.6 2019-11-19 19:36:37 +03:00
rinpatch 5386d1f49f UserEnabledPlug: fix test after backporting 
We didn't get rid of user info on stable yet
 2019-11-19 19:34:44 +03:00
rinpatch 957fb059df Add a changelog entry for email confirmation fix 2019-11-19 19:24:45 +03:00
lain 4079ed3b75 OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-19 19:24:13 +03:00
lain 5b5f855237 UserEnabledPlug: Don't authenticate unconfirmed users. 2019-11-19 19:23:21 +03:00
rinpatch ff4af8c5ee User: Don't let deactivated users authenticate. 2019-11-19 19:22:20 +03:00
rinpatch 3527a03e58 Add a changelog entry for oauth authorize fix 2019-11-19 19:19:12 +03:00
AkiraFukushima df22197755 Check client and token in GET /oauth/authorize 2019-11-19 19:15:14 +03:00
rinpatch b74f4260ae Fix rendering conversations when there's a malformed status 2019-11-19 19:14:35 +03:00
rinpatch 36f4382b33 Bump mix.exs version 2019-11-09 17:30:43 +03:00
rinpatch 182aee9fe8 Merge branch 'release/1.1.5' into 'stable' 
Release/1.1.5

See merge request pleroma/pleroma!1954
 2019-11-09 13:32:11 +00:00
rinpatch 287d92c920 Add a changelog entry about frontend bundle update 2019-11-09 02:09:47 +03:00
rinpatch 6871084f34 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 2019-11-09 01:47:32 +03:00
Ariadne Conill 6e65da782e object containment: handle all cases where ID is invalid (missing, nil, non-string) 2019-11-09 01:41:34 +03:00
rinpatch 4c5055bac9 Add changelog for 1.1.5 2019-11-08 23:43:11 +03:00
rinpatch 89ca9560e0 Bump HtmlEntities to 0.5 
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
 2019-11-08 23:38:32 +03:00
rinpatch 33d0250edc Object Fetcher: set cache after reinjecting 
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
 2019-11-08 22:47:08 +03:00
rinpatch c389fb4dcc Fix TrailingFormatPlug not being active for /api/oauth_tokens 2019-11-08 22:46:51 +03:00
lain 21716aa594 Merge branch 'release/1.1.4' into 'stable' 
Release/1.1.4 - user.info fix plus NOT NULL for user.info

See merge request pleroma/pleroma!1927
 2019-11-05 12:02:45 +00:00
lain b7de4ad082 Apply suggestion to CHANGELOG.md 2019-11-04 17:31:08 +00:00
lain 4388255eed Migrations: Don't copy over mutes unless there actually are some. 2019-11-04 18:13:37 +01:00
Ariadne Conill 6a151e7c7f streamer: use direct object for filter checks when there is no valid child object in an activity 
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291
 2019-11-04 16:25:05 +01:00
lain 5f844fd3f2 Migrations: Add a fixup migration for the muted_notifications 
This sets info->muted_notifications to an emtpy array if it is explicitly set
to null before. This can happen when safe_jsonb_set coalesces to a jsonb null,
which will make ecto not use the default value of [] anymore because it has been
explicitly overwritten.
 2019-11-04 15:38:28 +01:00
rinpatch 4bab9672ed Fix bookmark migration using a query with a schema 
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
 2019-11-01 16:26:27 +01:00
lain 6f5ac0819a Tests: Fix tests failing because of info being null. 2019-11-01 14:16:00 +01:00
lain d52f9c144f Mixfile: Bump version. 2019-11-01 13:40:58 +01:00
lain 5b34545b64 Changelog: Add information about user.info migration. 2019-11-01 13:40:28 +01:00
lain 8ad75f9ecf Migrations: Add migration to fill empty info fields and make them non-null. 2019-11-01 13:31:55 +01:00
lain a43b899e94 Merge branch 'release/1.1.3' into 'stable' 
1.1.3 release

See merge request pleroma/pleroma!1884
 2019-10-25 17:08:01 +00:00
rinpatch 948d0d3b0b mixfile: bump version to 1.1.3 2019-10-25 18:49:21 +03:00
rinpatch 3627ffc8b7 Changelog: Add 1.1.3 entry 2019-10-25 18:46:28 +03:00
rinpatch ca1871fbb4 Do not include notifications from blocked users when with_muted is set 
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
 2019-10-25 18:44:23 +03:00
rinpatch e91d5a23f4 pleroma_ctl: fix crashes due to different shift(1) behavior on dash 2019-10-25 18:32:09 +03:00
rinpatch 9b26d1608f Merge branch 'release/1.1.2' into 'stable' 
1.1.2 Release

See merge request pleroma/pleroma!1863
 2019-10-18 21:44:14 +00:00