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

290 Commits

Author SHA1 Message Date
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
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
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
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter 
- checking original inside gun adapter
- flushing streams on max_body error
 2020-03-04 18:13:24 +03:00
Mark Felder 85d571fc23 Move Tesla repo to our GitLab 2020-03-02 12:52:41 -06:00
Your New SJW Waifu 545a353114 Disable ssh/bbs foor performance 2020-03-02 07:39:52 -06:00
Your New SJW Waifu dbe4a997a7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-02 07:31:53 -06:00
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch c026128325 deps: update cachex to 3.2.0 2020-02-29 20:40:23 +03:00
Alexander Strizhakov 3849bbb60d
temp using tesla from fork 2020-02-21 12:30:37 +03:00
Your New SJW Waifu 3fa0dcbb7f Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-20 19:56:38 -06:00
Your New SJW Waifu 3eae0884af Force BBS/SSH enabled 2020-02-21 01:57:31 +00:00
Mark Felder cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
Alexander Strizhakov 514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
rinpatch 472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Your New SJW Waifu 16bf20e3bb updates to neckbeard 2020-02-14 16:05:29 -06:00
Haelwenn (lanodan) Monnier 04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm 2020-02-14 19:09:41 +01:00
Mark Felder 0b19fcdda1 Update ferd/recon, requested by @tk to support an AMPQ library he's 
integrating with an MRF.

Upstream changelog:

2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)
 2020-02-14 10:16:12 -06:00
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
rinpatch 9172540f8d deps: update floki to 0.25.0 
needed to make it use fast_html
 2020-02-11 16:16:29 +03:00
Your New SJW Waifu 507d3517a1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-11 02:46:18 -06:00
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Your New SJW Waifu 9468e1ec97 updates to neckbeard 2020-02-05 17:57:03 -06:00
rinpatch 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' 
Restarting pleroma from outside application

See merge request pleroma/pleroma!2144
 2020-02-05 16:59:21 +00:00
Your New SJW Waifu 4f32bf8569 Updates to neckbeard 2020-01-29 07:27:44 -06:00
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
Alexander Strizhakov 33bd8fbffe
filename and test fixes 2020-01-28 18:02:11 +03:00
Alexander Strizhakov 93b9f226e0
path fix 2020-01-28 16:32:33 +03:00
Alexander Strizhakov 251bbd794a Apply suggestion to mix.exs 2020-01-28 13:29:44 +00:00
Alexander Strizhakov aa3ba63513
like this 2020-01-28 15:41:45 +03:00
Alexander Strizhakov 91ea3ed82c
moving restarter application into pleroma repo 2020-01-28 15:19:05 +03:00
Maksim Pechnikov 02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00