alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,476 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
Mark Felder 4d3d867f10 Update Oban to 2.0-rc3 2020-07-03 10:37:07 -05:00
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban 2020-07-03 10:36:41 -05:00
Maksim Pechnikov dc60b1ee58 updated swoosh 2020-06-29 16:27:01 +03:00
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
Maksim Pechnikov 71e233268a oban 2.0-rc2 2020-06-23 21:47:01 +03:00
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
rinpatch d2a1975e56 mix.lock: update hackney to 1.16.0 
Closes #1612
 2020-05-30 00:18:17 +03:00
rinpatch 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
lain a985bd57b4 User.Query: Speed up recipients query. 2020-05-19 14:11:32 +02:00
Roman Chvanikov 512261c97d Update crypt library 2020-05-19 14:46:06 +03:00
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -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
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
rinpatch 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
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Alexander Strizhakov 4b00eb93fe
fix for syslog compile with updated rebar3 2020-05-06 18:04:16 +03:00
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'" 
This reverts merge request !1877
 2020-04-14 16:32:22 +00:00
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account 2020-04-14 19:45:22 +04:00
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses 2020-04-13 18:17:07 +04:00
Maksim Pechnikov 648cc699e5 Merge branch 'develop' into support/update_oban 2020-04-10 07:09:28 +03: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
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276 2020-04-02 14:47:17 +03:00
Maksim Pechnikov 591f7015d9 update Oban package 2020-04-02 09:34:11 +03:00
Egor Kislitsyn 23219e6fb3
Add OpenAPI 2020-04-01 23:13:08 +04:00
Alexander Strizhakov 1fcdcb12a7
updating gun with bug fix 
https://github.com/ninenines/gun/issues/222
 2020-03-30 12:47:12 +03:00
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier acb016397e mix.lock: [minor] last hash appended 2020-03-15 20:44:04 +01: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
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276 2020-03-08 14:10:59 +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
Alexander Strizhakov 509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Mark Felder 85d571fc23 Move Tesla repo to our GitLab 2020-03-02 12:52:41 -06:00
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction 2020-03-01 12:01:39 +03:00
rinpatch c026128325 deps: update cachex to 3.2.0 2020-02-29 20:40:23 +03:00
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
Alexander Strizhakov 3849bbb60d
temp using tesla from fork 2020-02-21 12:30:37 +03: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
Mark Felder 81cc9dd085 Merge branch 'develop' into chore/floki-update 2020-02-17 14:13:05 -06:00
lain 7df13e6f3a Update plug_crypto 2020-02-17 11:41:14 +01:00
Maksim Pechnikov 28701c08ad Merge branch 'develop' into issue/1276 2020-02-17 08:56:03 +03:00
rinpatch 472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Haelwenn (lanodan) Monnier a4a90ae422
Update all dependencies 
Upgraded:
  db_connection 2.2.0 => 2.2.1
  earmark 1.4.2 => 1.4.3
  ecto 3.3.1 => 3.3.3
  ecto_sql 3.3.2 => 3.3.4
  esshd 0.1.0 => 0.1.1
  ex_doc 0.21.2 => 0.21.3
  excoveralls 0.12.1 => 0.12.2
  gettext 0.17.1 => 0.17.4
  html_entities 0.5.0 => 0.5.1
  httpoison 1.6.1 => 1.6.2
  joken 2.1.0 => 2.2.0
  jose 1.9.0 => 1.10.1
  nimble_parsec 0.5.1 => 0.5.3
  phoenix 1.4.10 => 1.4.13
  phoenix_ecto 4.0.0 => 4.1.0
  phoenix_html 2.13.3 => 2.14.0
  plug_cowboy 2.1.0 => 2.1.2
  plug_crypto 1.1.0 => 1.1.1
  prometheus 4.4.1 => 4.5.0
  tesla 1.3.0 => 1.3.2
 2020-02-14 19:16:22 +01:00