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

588 Commits

Author SHA1 Message Date
Your New SJW Waifu 0964879958 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-06-04 21:15:39 -05:00
feld 86b38dd14b Merge branch 'develop' into 'phoenix1.7' 
# Conflicts:
#   mix.exs
 2023-06-02 15:41:40 +00:00
Mark Felder 2e45be2653 Add :phoenix to extra_applications to suppress a warning 
Related to use of Phoenix.Flash.get/2
 2023-06-02 11:34:04 -04:00
Haelwenn (lanodan) Monnier 313e68c180 mix: bump gettext to ~0.20 
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+
Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
 2023-06-02 03:06:32 +02:00
Mark Felder d9f031c9da Bump minimum Elixir to 1.12 2023-05-31 21:12:13 +00:00
Mark Felder 4dc2d4bf7b Remove locked version of plug 
Required for Phoenix 1.7 websocket changes
 2023-05-31 15:30:31 -04:00
Mark Felder 6e1ea2eafc Remove unnecessary compilers as of Phoenix 1.7 2023-05-31 13:36:07 -04:00
Mark Felder bed44f9f62 Update to Phoenix 1.7 
Chase the other deps to match versions you get from a current "mix phx.new" project creation
 2023-05-31 13:10:18 -04:00
Your New SJW Waifu 0fbdcf88e8 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-05-30 08:51:23 -05:00
Haelwenn (lanodan) Monnier 869f0d24a6 Merge branch 'release/2.5.2' into mergeback/2.5.2 2023-05-26 23:47:50 +02:00
Haelwenn (lanodan) Monnier 7618e562b3 Version 2.5.2 2023-05-26 19:57:00 +02:00
Your New SJW Waifu 9aa446ef2b Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-05-10 06:18:08 -05:00
duponin 0231a09310 Remove SSH/BBS feature from core 
And link to sshocial, the replacement client for this removed feature
 2023-04-23 10:47:07 +02:00
Your New SJW Waifu f0f7ca0ea4 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-04-15 09:27:23 -05:00
Haelwenn (lanodan) Monnier ce16ff7ae8 mix: Update all dependencies 2023-04-04 11:19:38 +02:00
tusooa 40f14fd31c Merge branch 'remove-crypt' into 'develop' 
Remove crypt(3) support

Closes #3030 and #3062

See merge request pleroma/pleroma!3847
 2023-03-30 12:47:36 +02:00
Your New SJW Waifu f777700e5f Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-03-13 16:18:53 -05:00
Your New SJW Waifu b44a9193e1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-03-09 15:18:40 -06:00
Haelwenn (lanodan) Monnier 5716654d12 Remove crypt(3) support 
This was used to support migration from GNU Social, which was used by at least
shitposter.club, should be entirely irrelevant now.

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3030
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3062
 2023-03-05 01:37:57 +01:00
tusooa f33401f54b
Merge remote-tracking branch 'upstream/stable' into mergeback/2.5.1 2023-03-01 20:09:50 -05:00
tusooa 75b76a0666
Bump version in mix project to 2.5.1 2023-02-20 12:32:45 -05:00
Sean King c69ae5f7c7
Bump crypt to v1.0.1 2023-02-20 12:29:38 -05:00
lain bb9ed51da7
Update mix.exs 2023-02-20 12:28:52 -05:00
tusooa 002159fc1c
Bump linkify 2023-02-20 12:28:52 -05:00
tusooa 259905a893
Bump earmark to 1.4.22 2023-02-20 12:20:29 -05:00
Your New SJW Waifu 5427d29b1f Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-02-13 12:01:30 -06:00
Your New SJW Waifu 140ee9cc06 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-02-10 13:58:53 -06:00
Sean King bf346cf07c
Bump crypt to v1.0.1 2023-02-09 23:06:04 -07:00
lain d0b781ab69 Merge branch 'from/upstream-develop/tusooa/2974-zwnj' into 'develop' 
Bump linkify - Fix zwnj in tags and double-dot links

Closes #2974 and #3022

See merge request pleroma/pleroma!3830
 2023-02-09 21:25:15 +00:00
lain 7138910f30 Update mix.exs 2023-02-09 14:37:34 -05:00
Your New SJW Waifu 54b5c25153 Use froth.zone branch of linkify to fix squid.kids 2023-01-23 15:47:06 -06:00
tusooa bddcb3ed68
Add names to additionalProperties 2023-01-15 17:28:32 -05:00
Your New SJW Waifu 733b658cf0 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-01-06 16:40:17 -06:00
tusooa a2766f310c
Bump linkify 2023-01-06 14:12:07 -05:00
tusooa 4b66f2b7f1
Bump earmark to 1.4.22 2022-12-28 11:57:29 -05:00
Your New SJW Waifu 87a84989a1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-12-23 16:21:31 -06:00
Haelwenn (lanodan) Monnier 6126f203d3 mix: version 2.5.50 2022-12-23 18:46:14 +01:00
Haelwenn (lanodan) Monnier 91c22637de mix: Release 2.5.0 2022-12-23 17:10:02 +01:00
Your New SJW Waifu 730e03dbe6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-12-19 16:21:30 -06:00
Lain Soykaf 63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
Your New SJW Waifu f4f634e2fb Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-11-29 09:37:33 -06:00
Haelwenn (lanodan) Monnier f6d55e1e77 Mergeback of release 2.4.5 2022-11-27 13:20:42 +01:00
Mark Felder e9c3be262c Bump credo 
Old credo is throwing errors on my Elixir 1.13 / OTP 25
 2022-11-13 14:17:41 -05:00
Your New SJW Waifu a1b6b71ff1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-11-13 00:56:27 -06:00
Mark Felder 6b87b3f2ea Remove Quack logging backend 2022-11-11 12:36:29 -05:00
Your New SJW Waifu 243f801f5d Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-11-06 12:00:10 -06:00
tusooa 8d704d384d Merge branch 'ci-coverage' into 'develop' 
Test coverage: Switch to covertool to get cobertura output

See merge request pleroma/pleroma!3745
 2022-11-06 02:19:27 +00:00
Mark Felder 7c64f705f6 Update to Phoenix 1.6 and chase dependencies 
Also bump minimum Elixir to 1.11
 2022-11-03 16:13:07 +00:00
Your New SJW Waifu a7f0d18a00 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-10-09 12:23:04 -05:00
Tusooa Zhu dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
Your New SJW Waifu 70cd62b033 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-10-04 11:35:58 -05:00
Haelwenn 5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
tusooa ac95b8b4f3 Merge branch 'websocketex' into 'develop' 
Use Websockex to replace websocket_client

See merge request pleroma/pleroma!3743
 2022-09-18 17:09:12 +00:00
Your New SJW Waifu 11ea7d98bb Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-09-06 14:52:04 -05:00
tusooa f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
Haelwenn 257601d67d Merge branch 'ssh-bbs-improvements' into 'develop' 
BBS: add functionnalities and readability

See merge request pleroma/pleroma!3675
 2022-09-03 11:15:07 +00:00
Haelwenn (lanodan) Monnier be411ad3bc Test coverage: Switch to covertool to get cobertura output 
This allows to have coverage information integrated into Gitlab
 2022-09-03 05:03:50 +02:00
Haelwenn (lanodan) Monnier ec80a1e405 Bump minimum Elixir version to 1.10 
1.9 being end-of-life
 2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier 93ed6da4a3 mix: Switch prometheus_ex to fix/elixir-1.14 branch 2022-09-03 03:58:22 +02:00
Tusooa Zhu 6d148b6637 Use Websockex to replace websocket_client 2022-09-03 02:13:00 +02:00
Haelwenn b439e91f57 Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'" 
This reverts merge request !3649
 2022-09-02 22:35:40 +00:00
Haelwenn (lanodan) Monnier 21ab7369ca Bump minimum Elixir version to 1.10 
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.

Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
 2022-09-02 22:53:54 +02:00
Haelwenn 01239456a1 Merge branch 'rewrite/integration-test-websocket-client' into 'develop' 
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812

Closes #2812

See merge request pleroma/pleroma!3649
 2022-09-02 19:18:22 +00:00
Tusooa Zhu 31fd41de0c
Release 2.4.4 2022-08-19 20:29:06 -04:00
Tusooa Zhu eb42e90c4f
Use Websockex to replace websocket_client 2022-08-19 20:24:21 -04:00
Your New SJW Waifu 0430be87e1 Report pleroma until husky fixes it 2022-08-03 18:16:42 -05:00
Your New SJW Waifu 6ba6456150 Full migration from Pleroma to Akkoma 2022-07-29 18:16:19 -05:00
Your New SJW Waifu 99d2710e69 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-07-05 16:17:17 -05:00
Hélène c3a0944ce5
mix: update eblurhash to 1.2.2 
Previous eblurhash versions bundled precompiled binaries which caused
issues on non-Darwin operating systems.
 2022-07-02 14:52:28 +02:00
duponin e606b9ab3f add missing extra application to start the SSH BBS 2022-05-18 20:05:42 +02:00
Your New SJW Waifu f53d289b51 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-06 22:31:08 -05:00
Haelwenn (lanodan) Monnier f9943b2065 mix: Bump to 2.4.52 for 2.4.3 mergeback 2022-05-06 10:23:43 +02:00
Ilja c3b2b71ea2 update sweet_xml [Security] 2022-05-06 10:23:25 +02:00
Haelwenn (lanodan) Monnier 57c486014c Release 2.4.3 2022-05-06 09:01:33 +02:00
Ilja 85cbf773f0 update sweet_xml [Security] 2022-05-06 08:36:58 +02:00
Your New SJW Waifu 078d314354 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-25 09:07:30 -05:00
Haelwenn d7c53da77a Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop' 
Translate backend-rendered pages

See merge request pleroma/pleroma!3634
 2022-03-20 18:14:37 +00:00
Sean King d0c1997d48
Rewrite integration-test websocket client with Mint.WebSocket 2022-03-19 23:33:37 -06:00
Your New SJW Waifu de2682231e Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-18 01:34:11 -05:00
Tusooa Zhu 79ccb6b999
Support fallbacking to other languages 2022-03-06 11:43:31 -05:00
Haelwenn (lanodan) Monnier 56197192bb mix: Check .git presence 2022-02-25 10:39:12 +01:00
Your New SJW Waifu b762792837 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:53 -06:00
Alex Gleason d5eb44e8b3
Upgrade Linkify to v0.5.2 2022-01-15 12:27:16 -06:00
Your New SJW Waifu acb6e32006 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-13 11:43:06 -06:00
rinpatch f4bc2f5975 Add 2.4.2 changelog entry and bump mix version 2022-01-11 13:39:23 +03:00
lain 991b26f494 Merge branch 'update-hackney' into 'develop' 
Mix: upgrade Hackney to 1.18.0

Closes #2753

See merge request pleroma/pleroma!3549
 2022-01-10 17:40:31 +03:00
Sean King bf995a7770
Upgrade web_push_encryption to 0.3.1 2022-01-01 21:02:09 -07:00
Sean King 91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1 2022-01-01 14:49:57 -07:00
Your New SJW Waifu e70a8107fa Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-30 10:40:51 -06:00
Lain Soykaf 6efbd08854 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch 2021-12-26 16:41:17 +01:00
Alex Gleason 1fa616638b Merge branch 'warnings-as-errors' into 'develop' 
Enable :warnings_as_errors for CI only

See merge request pleroma/pleroma!3474
 2021-12-23 16:19:57 +00:00
Alex Gleason e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:05:36 -05:00
Alex Gleason 29d80b39f2
Add Phoenix LiveDashboard 
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
 2021-12-15 19:05:27 -05:00
Lain Soykaf abb62dd886 Application, dependencies: prepare for finch 2021-12-15 13:53:09 -05:00
Your New SJW Waifu 68278ab5bd Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-14 06:57:13 -06:00
lain 613f55b078 Merge branch 'benchmark' into 'develop' 
Fix benchmarks

See merge request pleroma/pleroma!3551
 2021-12-06 21:16:30 +00:00
Alex Gleason ce4560c2a1
Fix benchmarks 2021-12-03 16:20:54 -05:00
a1batross 809503011f Mix: upgrade Hackney to 1.18.0 2021-11-29 17:28:10 +00:00
Haelwenn c97f99ccf2 Merge branch 'bugfix/markdown-newlines' into 'develop' 
mix: Update earmark

See merge request pleroma/pleroma!3538
 2021-11-16 13:54:34 +00:00
Haelwenn (lanodan) Monnier 5e15ceb49d mix: Update earmark 
This should fix the presence of extraneous newlines in markdown output.

Related: https://github.com/pragdave/earmark/issues/406
 2021-11-16 14:33:27 +01:00