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 |
|
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 |
|
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 |
|
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 |
|
|
|
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
|
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 |
|
Alex Gleason
|
a4c9739965
|
Fix Rebased --> Pleroma instance version
|
2022-08-25 14:02:38 -05: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 |
|
Alex Gleason
|
4de6c67e92
|
Soapbox BE --> Rebased
|
2022-08-17 11:25:39 -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 |
|
duponin
|
e606b9ab3f
|
add missing extra application to start the SSH BBS
|
2022-05-18 20:05:42 +02:00 |
|
Alex Gleason
|
e13f64bd8e
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-05-17 11:19:29 -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 |
|
Alex Gleason
|
f3e77415cc
|
Fix MIX_ENV=prod mix compile
|
2022-04-27 13:42:39 -05:00 |
|
Alex Gleason
|
b8dd4c7e3e
|
Fix semver parsing, add "+soapbox" to instance version
|
2022-04-27 12:47:21 -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 |
|
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 |
|
Haelwenn (lanodan) Monnier
|
56197192bb
|
mix: Check .git presence
|
2022-02-25 10:39:12 +01: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 |
|
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 |
|
Alex Gleason
|
bb0571cb35
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2021-12-27 17:04:24 -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
|
b41631f62c
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2021-12-25 21:24:21 -06: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
|
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 |
|
lain
|
613f55b078
|
Merge branch 'benchmark' into 'develop'
Fix benchmarks
See merge request pleroma/pleroma!3551
|
2021-12-06 21:16:30 +00:00 |
|
