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

319 Commits

Author SHA1 Message Date
Your New SJW Waifu d269e61071 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-20 23:01:32 -05:00
Roman Chvanikov 512261c97d Update crypt library 2020-05-19 14:46:06 +03:00
Your New SJW Waifu ba2409f19c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-14 13:08:54 -05:00
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -05:00
Your New SJW Waifu df2b7a6909 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-13 10:16:32 -05:00
lain 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
Alex Gleason b46811a074
Upgrade Comeonin to v5 
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
 2020-05-12 17:14:59 -05:00
rinpatch da2fe8920d fix eldap being required for non-OTP releases 2020-05-12 23:03:21 +03:00
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
Your New SJW Waifu cccdf7cc21 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-09 09:07:19 -05:00
rinpatch b6d1bcc55d include eldap in OTP releases 
Closes #1313
 2020-05-09 15:17:12 +03:00
Your New SJW Waifu 6d0f7d1efd Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-07 07:49:56 -05:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Your New SJW Waifu 72655bd064 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-29 16:01:43 -05:00
Your New SJW Waifu 0c12056531 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-20 11:45:52 -05:00
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
Haelwenn (lanodan) Monnier c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists 2020-04-19 20:24:32 +02:00
Your New SJW Waifu 6a2d38e4ce Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-15 21:06:27 -05:00
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses 2020-04-13 18:17:07 +04:00
Your New SJW Waifu 8c72cd3d54 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-11 10:31:22 -05:00
Your New SJW Waifu 92243e62b2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-09 23:33:53 -05:00
Maksim Pechnikov 648cc699e5 Merge branch 'develop' into support/update_oban 2020-04-10 07:09:28 +03:00
kPherox c2aad36aa8 Rename function 2020-04-09 23:19:41 +00:00
kPherox 0e8f6d24b8
Create OTP_VERSION file by `mix release` 2020-04-10 00:22:50 +09:00
Your New SJW Waifu f0b5c45e3b Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-09 09:39:47 -05:00
lain 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
Your New SJW Waifu cf563451ae Revert "Merge branch 'revert-76fc9276' into 'neckbeard'" 
This reverts merge request !2
 2020-04-03 09:03:38 +00:00
Maksim Pechnikov 591f7015d9 update Oban package 2020-04-02 09:34:11 +03:00
Your New SJW Waifu 02160dbc03 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" 
This reverts commit 76fc927650
 2020-04-02 00:57:27 +00:00
Egor Kislitsyn 23219e6fb3
Add OpenAPI 2020-04-01 23:13:08 +04:00
Your New SJW Waifu 76fc927650 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-04-01 12:12:21 -05:00
Alexander Strizhakov 1fcdcb12a7
updating gun with bug fix 
https://github.com/ninenines/gun/issues/222
 2020-03-30 12:47:12 +03:00
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Your New SJW Waifu 2bb5ade487 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-24 13:28:11 -05:00
Cevado 4705590f76 Fix ssl option on Ecto config breaking release 
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
 2020-03-16 22:02:01 -03:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Your New SJW Waifu 0d0fda0f62 This fucks with apps 2020-03-15 18:34:02 -05:00
Your New SJW Waifu 4de4e580da Nevermind we're mastodon now 2020-03-15 01:42:40 -05:00
Your New SJW Waifu 9bdbc9694e Only [a-z0-9] is allowed 😞 2020-03-15 01:29:21 -05:00
Your New SJW Waifu b2c8136e7f Better name 2020-03-15 01:23:13 -05:00
Your New SJW Waifu bd15d8cfe8 New name and logo 2020-03-15 01:13:17 -05:00
Your New SJW Waifu 9ddfaf89da Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-14 09:18:12 -05:00
Haelwenn (lanodan) Monnier 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
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
Your New SJW Waifu 9fcfe55005 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-08 18:02:26 -05:00
rinpatch 86e7709a4d mix.exs: bump version to development one 2020-03-08 23:24:30 +03:00
Your New SJW Waifu a68fe6c172 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-08 10:35:32 -05:00
rinpatch 3508ae7039 version bump changelog and mix version 2020-03-05 22:35:23 +03:00
Alexander Strizhakov fe47bcde8c
updating tesla ref 2020-03-04 19:44:03 +03:00