ed881247b7
set swoosh version
2020-07-29 06:50:00 +03:00
15b8446cdb
updated dev & test packages
2020-07-29 06:47:56 +03:00
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
5d263dfdb3
Update linkify to latest release
2020-07-20 09:29:03 -05:00
5701840d30
Use updated Linkify from git
2020-07-16 15:01:13 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
ebfa591689
Go back to upstream Tesla
2020-07-15 15:26:35 +03:00
6b1f6a1cf7
Bump gun
2020-07-15 15:26:35 +03:00
4128e3a84a
HTTP: Implement max request limits
2020-07-15 15:26:35 +03:00
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
2020-07-10 11:34:53 -05:00
d7a37fddd1
Switch to the official Oban 2.0.0 release
2020-07-10 11:33:08 -05:00
b6688030fa
prometheus update for OTP 23
2020-07-10 10:35:59 +03:00
4d3d867f10
Update Oban to 2.0-rc3
2020-07-03 10:37:07 -05:00
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
2020-07-03 10:36:41 -05:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
dc60b1ee58
updated swoosh
2020-06-29 16:27:01 +03:00
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
2020-06-24 09:12:32 +03:00
71e233268a
oban 2.0-rc2
2020-06-23 21:47:01 +03:00
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
d2a1975e56
mix.lock: update hackney to 1.16.0
...
Closes #1612
2020-05-30 00:18:17 +03:00
48bcb22146
Merge branch 'recipients-query-speedup' into 'develop'
...
Greatly speed up recipients query
See merge request pleroma/pleroma!2558
2020-05-19 14:32:27 +00:00
a985bd57b4
User.Query: Speed up recipients query.
2020-05-19 14:11:32 +02:00
512261c97d
Update crypt library
2020-05-19 14:46:06 +03:00
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
2020-05-13 10:53:56 -05:00
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
9c3c142c32
Restore mix.lock after 2FA merge
...
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
2020-05-07 14:35:29 +03:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
4b00eb93fe
fix for syslog compile with updated rebar3
2020-05-06 18:04:16 +03:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
648cc699e5
Merge branch 'develop' into support/update_oban
2020-04-10 07:09:28 +03:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
acb016397e
mix.lock: [minor] last hash appended
2020-03-15 20:44:04 +01:00
d1379c4de8
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-13 16:07:17 +01:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
Maksim Pechnikov
lain
Ivan Tashkinov
Alex Gleason
href
rinpatch
Mark Felder
Alexander Strizhakov
Roman Chvanikov
Egor Kislitsyn
Haelwenn (lanodan) Monnier