sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,707 Commits 1 Branch 0 Tags 184 MiB
c0a630d42f
Commit Graph

8707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder
c0a630d42f Update AdminFE build in preparation for Pleroma 2.0.2 2020-04-08 00:29:19 +03:00
rinpatch
94240cac4e Merge branch 'fix-auto-link-for-profile-fields' into 'develop' 
Use Pleroma.Formatter.linkify/2 instead

See merge request pleroma/pleroma!2352
 2020-04-08 00:29:19 +03:00
rinpatch
ae937bcaa1 CHANGELOG.md: add entries for funkwhale-related changes 2020-04-08 00:29:18 +03:00
rinpatch
06444a1501 Merge branch 'bugfix/earmark_renderer_test' into 'develop' 
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex

See merge request pleroma/pleroma!2300
 2020-04-02 23:02:32 +03:00
Haelwenn
b0a9a02af3 Merge branch 'feature/funkwhale-audio' into 'develop' 
Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
 2020-04-02 23:00:23 +03:00
Haelwenn
01a3f145d5 Merge branch 'bugfix/funkwhale-channel' into 'develop' 
Fix profile url for funkwhale channels, removes one source_data use

Closes #1653

See merge request pleroma/pleroma!2333
 2020-04-02 22:55:09 +03:00
lain
e97b50d17a Merge branch 'fix-testing' into 'develop' 
Fix CI by temporarily removing federated testing

See merge request pleroma/pleroma!2314
 2020-03-31 14:09:27 +03:00
rinpatch
a674094ec6 mix.exs bump version to 2.0.2 2020-03-31 14:02:51 +03:00
rinpatch
78b6549611 CHANGELOG.md: Add 2.0.2 entry 2020-03-31 13:59:26 +03:00
Haelwenn
540dd38a5e Merge branch 'docs/mrf_object_age' into 'develop' 
Improve documentation of mrf_object_age

See merge request pleroma/pleroma!2305
 2020-03-31 13:42:42 +03:00
rinpatch
0c010c292e Merge branch 'fix/ecto_ssl_option' into 'develop' 
Fix ssl option on Ecto config breaking release

See merge request pleroma/pleroma!2307
 2020-03-31 13:42:19 +03:00
rinpatch
e99e2a86af Merge branch 'bugfix/profile-bio-newline' into 'develop' 
AccountView: fix for other forms of <br> in bio

Closes #1643

See merge request pleroma/pleroma!2322
 2020-03-31 13:42:02 +03:00
lain
c4d3ccc7b9 Merge branch 'admin-api-change-password' into 'develop' 
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`

See merge request pleroma/pleroma!2149
 2020-03-31 13:41:47 +03:00
feld
10b7b2b4a4 Merge branch 'fix/activity-deletion' into 'develop' 
Fix activity deletion

Closes #1640

See merge request pleroma/pleroma!2328
 2020-03-31 13:40:28 +03:00
rinpatch
0e92aa0025 Merge branch '1364-notifications-sending-control' into 'develop' 
[#1364] Ability to opt-out of notifications (in all clients)

Closes #1364

See merge request pleroma/pleroma!2301
 2020-03-31 13:39:58 +03:00
rinpatch
bb49d8f5a0 Merge branch 'release/2.0.1' into 'stable' 
2.0.1 release

See merge request pleroma/pleroma!2298
 2020-03-15 21:54:24 +00:00
rinpatch
8d15d6c3ab CHANGELOG.md: Add upgrade notes for 2.0.1 2020-03-16 00:50:03 +03:00
rinpatch
be500f8c88 CHANGELOG.md: Add remaining entries for 2.0.1 2020-03-16 00:18:16 +03:00
rinpatch
e25197788f static-fe tests: fix to work on stable 2020-03-16 00:17:28 +03:00
rinpatch
c46d035f7b rate limiter: disable based on if remote ip was found, not on if the plug was enabled 
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable  when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.

Also closes #1620
 2020-03-16 00:15:21 +03:00
rinpatch
9d09755291 rip out fetch_initial_posts 
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
 2020-03-16 00:15:11 +03:00
rinpatch
fcf51a77ba Merge branch 'features/staticfe-sanitization' into 'develop' 
static_fe: Sanitize HTML

Closes #1614

See merge request pleroma/pleroma!2299
 2020-03-16 00:14:04 +03:00
rinpatch
8096bfb891 changelog.md: add 2.0.1 entry 2020-03-15 17:26:58 +03:00
Haelwenn (lanodan) Monnier
306d633b40 pleroma_api_controller.ex: Improve conversations error reporting 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
 2020-03-15 17:01:33 +03:00
Mark Felder
aa4407be93 Update AdminFE 2020-03-15 17:01:16 +03:00
rinpatch
0b823755a2 Merge branch 'fix/cache-control-headers' into 'develop' 
Fix Cache Control headers on media

See merge request pleroma/pleroma!2295
 2020-03-15 17:01:04 +03:00
Haelwenn (lanodan) Monnier
3f54215219 auth_controller.ex: Add admin scope to MastoFE 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
 2020-03-15 17:00:41 +03:00
Haelwenn (lanodan) Monnier
f9c43a4d9d pleroma_api.md: direct_conversation_id vs. conversation_id 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
 2020-03-15 17:00:30 +03:00
Egor Kislitsyn
ffd636f109 Fix hashtags WebSocket streaming 2020-03-15 17:00:18 +03:00
Phil Hagelberg
bd80ff9a6c Fix static FE plug to handle missing Accept header. 2020-03-15 17:00:06 +03:00
Haelwenn (lanodan) Monnier
5f9fbd7d33 Formatting: Do not use \n and prefer <br> instead 
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
 2020-03-15 16:59:52 +03:00
rinpatch
80bc8c2cc9 Revert "Set better Cache-Control header for static content" 
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.

Closes #1613
 2020-03-15 16:59:39 +03:00
rinpatch
2183d8f849 Merge branch 'docs/new_user' into 'develop' 
CLI_tasks/user.md: Fix `pleroma.user new` documentation

Closes #1621

See merge request pleroma/pleroma!2286
 2020-03-15 16:59:20 +03:00
feld
e7837bc14e Merge branch 'fix/signup-without-email' into 'develop' 
Allow account registration without an email

See merge request pleroma/pleroma!2246
 2020-03-15 16:58:51 +03:00
Haelwenn (lanodan) Monnier
e3ccaeaa53 installation/otp_en.md: Fix pleroma.nginx target [deb] 
Needs to be backported to stable.

Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
 2020-03-15 16:58:29 +03:00
Mark Felder
f8dc597c51 Fix enforcement of character limits 2020-03-15 16:58:13 +03:00
rinpatch
423cfaf141 Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' 
Merging default release config on app start

Closes #1610

See merge request pleroma/pleroma!2288
 2020-03-15 16:57:59 +03:00
Alexander Strizhakov
7cf7083076 relay list shows hosts without accepted follow 2020-03-15 16:55:20 +03:00
Haelwenn (lanodan) Monnier
963df689b9 static-fe.css: Restore from before a65ee8ea 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
 2020-03-15 16:55:00 +03:00
rinpatch
e3f26920d0 mix.exs: bump version to 2.0.1 2020-03-15 16:54:27 +03:00
rinpatch
e8493431bf Merge branch 'release/2.0.0' into 'stable' 
Release/2.0.0

See merge request pleroma/pleroma!2273
 2020-03-08 10:38:35 +00:00
rinpatch
e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af 2020-03-07 18:18:43 +03:00
rinpatch
80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' 
moderation log: fix improperly migrated data

See merge request pleroma/pleroma!2277
 2020-03-07 14:45:00 +00:00
rinpatch
6cf1958b02 moderation log: fix improperly migrated data 
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.

Closes #1606
 2020-03-07 17:00:58 +03:00
Alexander Strizhakov
474ef512df wait in mix task while pleroma is rebooted 2020-03-07 16:02:55 +03:00
rinpatch
f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0' 
Remove EmojiPacks from AdminFE build

See merge request pleroma/pleroma!2275
 2020-03-06 20:23:39 +00:00
Mark Felder
e25bacabb1 Remove EmojiPacks from AdminFE build 
Once more, with feeling
 2020-03-06 09:54:38 -06:00
rinpatch
a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd 2020-03-05 23:41:47 +03:00
rinpatch
4271cfb81a Merge branch 'stable' into release/2.0.0 2020-03-05 22:38:38 +03:00
rinpatch
7605fe5065 Merge branch 'stable' into release/2.0.0 2020-03-05 22:36:35 +03:00