|
|
f1592b2947
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-07-26 22:32:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
9e69adf76f
|
mix: Remove override on plug
|
2023-06-27 02:38:31 +02:00 |
|
Haelwenn (lanodan) Monnier
|
aa4c4ab2a0
|
mix: 2023-06 deps update
this fixes compatibility with Erlang OTP 26
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2913
|
2023-06-27 02:38:31 +02:00 |
|
Alex Gleason
|
944fd73b36
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-06-05 15:38:19 -05:00 |
|
feld
|
86b38dd14b
|
Merge branch 'develop' into 'phoenix1.7'
# Conflicts:
# mix.exs
|
2023-06-02 15:41:40 +00: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
|
4dc2d4bf7b
|
Remove locked version of plug
Required for Phoenix 1.7 websocket changes
|
2023-05-31 15:30:31 -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 |
|
|
|
94cdedc6c9
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-09 22:27:06 +02: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 |
|
Haelwenn (lanodan) Monnier
|
ce16ff7ae8
|
mix: Update all dependencies
|
2023-04-04 11:19:38 +02:00 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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
|
572751bec7
|
Clean up stale entries in mix.lock
mix deps.clean --unlock --unused
|
2022-11-11 12:48:13 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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
|
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
|
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 |
|
Alex Gleason
|
f63b84e6dd
|
Include OAUTH_CONSUMER_STRATEGIES deps in mix.lock
|
2022-08-11 19:10:26 -05:00 |
|
|
|
abe13622e6
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-17 16:08:26 +02: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 |
|
Alex Gleason
|
e13f64bd8e
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-05-17 11:19:29 -05:00 |
|
Ilja
|
c3b2b71ea2
|
update sweet_xml [Security]
|
2022-05-06 10:23:25 +02:00 |
|
Sean King
|
d0c1997d48
|
Rewrite integration-test websocket client with Mint.WebSocket
|
2022-03-19 23:33:37 -06:00 |
|
Tusooa Zhu
|
79ccb6b999
|
Support fallbacking to other languages
|
2022-03-06 11:43:31 -05:00 |
|
Kenneth Zhao
|
cff57ea23b
|
use remote_ip repo under gitlab/soapbox/elixir_library in case git.pleroma.social is down
|
2022-02-28 20:25:14 -08:00 |
|
Alex Gleason
|
64f48c4239
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2022-01-22 11:24:43 -06:00 |
|
Alex Gleason
|
d5eb44e8b3
|
Upgrade Linkify to v0.5.2
|
2022-01-15 12:27:16 -06: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 |
|
Alex Gleason
|
bb0571cb35
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2021-12-27 17:04:24 -06:00 |
|
Lain Soykaf
|
7ed2258979
|
Update changelog
|
2021-12-26 17:00:09 +01: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
|
b41631f62c
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2021-12-25 21:24:21 -06:00 |
|
Alex Gleason
|
58577d89e0
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:06:10 -05: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 |
|
Alex Gleason
|
7456e76c4d
|
Upgrade hackney to v1.18
|
2021-12-07 13:47:48 -05:00 |
|
Alex Gleason
|
ab5dee84bf
|
Run mix deps.get
|
2021-12-07 10:03:31 -05:00 |
|
Alex Gleason
|
44b7336f35
|
Upgrade eblurhash to v1.2.2
|
2021-11-22 21:01:23 -06:00 |
|
Alex Gleason
|
ec024ff3fd
|
Downgrade hackney again
|
2021-11-22 12:42:57 -06:00 |
|
Alex Gleason
|
7bcc60d740
|
Merge remote-tracking branch 'origin/develop' into pleroma-v2.4.0
|
2021-11-21 13:30:43 -06: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 |
|
lain
|
4d341f51e1
|
Merge branch 'fix-tests' into 'develop'
Test fixes
See merge request pleroma/pleroma!3532
|
2021-11-15 14:31:27 +00:00 |
|
lain
|
838da53ea7
|
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
|
2021-11-15 11:58:49 +00:00 |
|
Lain Soykaf
|
7dcc73f294
|
Mix: Update crypt to fix musl builds.
|
2021-11-14 16:04:08 +01:00 |
|
Lain Soykaf
|
26450a0be3
|
Mix: Upgrade mogrify library
The old library would modify a file on reading it, the new one
doesn't have this issue.
|
2021-11-14 11:43:39 +01:00 |
|
Haelwenn (lanodan) Monnier
|
e4ad4f0bd6
|
mix: Update http_signatures to 0.1.1
|
2021-11-10 00:53:32 +01:00 |
|
Alex Gleason
|
d131247ff3
|
Switch to deps from gitlab.com
|
2021-11-04 11:34:18 -05:00 |
|
Haelwenn (lanodan) Monnier
|
3b20eddcf8
|
mix: Update crypt to fix #pragma warning
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2710
|
2021-10-06 07:40:02 +02:00 |
|
Alex Gleason
|
90680aad90
|
Merge tag 'v2.4.0' into pleroma-v2.4.0
|
2021-08-08 10:46:48 -05:00 |
|
Alex Gleason
|
c369f52b4a
|
Merge remote-tracking branch 'origin/develop' into instance-deletion
|
2021-07-17 15:00:53 -05:00 |
|
Alex Gleason
|
c136dc0987
|
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
|
2021-07-17 13:53:19 -05:00 |
|
Mark Felder
|
64d009693e
|
Update Linkify to fix crash on posts with a URL we failed to parse correctly
|
2021-07-08 12:33:17 -05:00 |
|
feld
|
f97f305d00
|
Merge branch 'ecto-upgrade' into 'develop'
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
|
2021-06-23 20:17:01 +00:00 |
|
Alex Gleason
|
54af527759
|
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
|
2021-06-23 13:22:32 -05:00 |
|
Haelwenn (lanodan) Monnier
|
a851a24036
|
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5.
|
2021-06-22 11:19:13 +02:00 |
|
Alex Gleason
|
a39ada9bbf
|
Merge remote-tracking branch 'origin/develop' into email-list
|
2021-06-15 13:21:40 -05:00 |
|
Alex Gleason
|
90df530dec
|
AdminAPI: get email list subscribers
|
2021-06-14 20:08:13 -05:00 |
|
Alex Gleason
|
d0147eba78
|
Use eblurhash 1.1.0 from Hex
|
2021-06-09 09:28:22 -05:00 |
|
Haelwenn (lanodan) Monnier
|
7c5e007b9c
|
mix: Update pot to ~> 1.0
|
2021-06-03 19:11:16 +02:00 |
|
Haelwenn (lanodan) Monnier
|
ab32ea44f0
|
mix.exs: Apply OTP24 fixes to web_push_encryption
|
2021-06-03 19:11:16 +02:00 |
|
Haelwenn (lanodan) Monnier
|
2768063387
|
mix: Update dependencies
|
2021-06-03 19:11:16 +02:00 |
|
Haelwenn (lanodan) Monnier
|
166455c884
|
mix: Switch hackney & gun to releases
|
2021-06-03 19:10:47 +02:00 |
|
Haelwenn (lanodan) Monnier
|
59af07f149
|
Update all dependencies
|
2021-06-03 19:10:47 +02:00 |
|
Alex Gleason
|
1c229364a5
|
Merge remote-tracking branch 'origin/develop' into blurhash
|
2021-05-14 09:12:41 -05:00 |
|
Alex Gleason
|
bcf6efce15
|
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
|
2021-05-14 09:09:32 -05:00 |
|
Alex Gleason
|
543e9402d6
|
Support blurhash
|
2021-05-14 09:07:16 -05:00 |
|
Alex Gleason
|
b00d3bafa6
|
Merge remote-tracking branch 'origin/develop' into rich-media-redux
|
2021-05-05 12:38:58 -05:00 |
|
Alex Gleason
|
765bdfca7d
|
Get basic embed working
|
2021-05-04 02:24:30 -05:00 |
|
Alex Gleason
|
c5ae620451
|
Merge commit 'a8fa00ef666f574aec8048626aed78a7d62e6915' into earmark
|
2021-04-30 14:12:53 -05:00 |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Alex Gleason
|
004bcedb07
|
Upgrade Earmark 1.4.15
|
2021-04-30 12:23:11 -05:00 |
|
