|
|
bda8589f16
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-15 19:39:24 +01: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 |
|
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 |
|
tusooa
|
bddcb3ed68
|
Add names to additionalProperties
|
2023-01-15 17:28:32 -05:00 |
|
|
|
a9e3ff9af9
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-01-10 13:39:39 +01: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 |
|
|
|
e3970f730c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:45:55 +01: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 |
|
|
|
7ee63904ec
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-22 19:20:52 +01:00 |
|
Lain Soykaf
|
63d00f8123
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
|
2022-12-15 17:19:36 -05:00 |
|
|
|
87e9b4c5ef
|
Update geospatial package, update config and description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-29 13:56:40 +01:00 |
|
Haelwenn (lanodan) Monnier
|
f6d55e1e77
|
Mergeback of release 2.4.5
|
2022-11-27 13:20:42 +01:00 |
|
|
|
2e7a713e58
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-16 00:06:25 +01:00 |
|
|
|
b7879d58f3
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-15 23:27:58 +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 |
|
Mark Felder
|
6b87b3f2ea
|
Remove Quack logging backend
|
2022-11-11 12:36:29 -05: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 |
|
|
|
2c62043ef9
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-05 21:08:08 +01: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 |
|
Josh Adams
|
ec6ee11ea7
|
Add most (all?) the promex setup
|
2022-10-27 19:47:37 -05:00 |
|
Josh Adams
|
b6ef38d611
|
Bump a ton of dependencies
All in service of bringing in prom_ex, we'll see
|
2022-10-27 19:38:35 -05:00 |
|
|
|
8221504ecb
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-10-12 21:52:36 +02:00 |
|
Alex Gleason
|
ddaeb09e54
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-10-09 13:46:48 -05:00 |
|
Tusooa Zhu
|
dd82fd234f
|
Merge branch 'release/2.4.4' into mergeback/2.4.4
|
2022-10-08 22:15:09 -04:00 |
|
|
|
73e7549d94
|
Update scheduled notitfications on edit
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-02 16:32:34 +02:00 |
|
Alex Gleason
|
544be36c80
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-09-28 17:29:53 -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 |
|
|
|
3b498061ed
|
Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-16 21:24:22 +02: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 |
|
|
|
8fc5609cdf
|
Add icalendar to dependencies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-05 15:23:06 +02:00 |
|
|
|
f1607c3d3b
|
Add geospatial package dependency
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-05 13:53:13 +02:00 |
|
|
|
cdf454bfd2
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
|
2022-09-03 17:04:02 +02: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 |
|
