Alex Gleason
|
544be36c80
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-09-28 17:29:53 -05: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 |
|
