bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14792 commits 1 branch 0 tags 292 MiB
Commit graph

471 commits

Author SHA1 Message Date
marcin mikołajczak
f1607c3d3b Add geospatial package dependency 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 13:53:13 +02:00
marcin mikołajczak
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
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
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
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
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
Alex Gleason
cebd707ac0
Merge remote-tracking branch 'pleroma/benchmark' into benchmark 2021-12-05 17:05:16 -05: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
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
18d23c9acc
Merge tag 'v2.4.1' into pleroma-v2.4.0 2021-11-21 13:34:44 -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
bdaa7e5394 Merge branch 'bugfix/crypt-pragma' into 'develop' 
mix: Update crypt to fix #pragma warning

Closes #2710

See merge request pleroma/pleroma!3527
 2021-10-06 05:58:52 +00: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
Haelwenn (lanodan) Monnier
28a17c2dc7
Merge branch 'release/2.4.1' into chores/2.4.1-develop 2021-08-28 18:49:04 +02:00
Haelwenn (lanodan) Monnier
7372609c5b
Release 2.4.1 2021-08-28 18:32:21 +02:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0 2021-08-08 10:46:48 -05:00
Haelwenn (lanodan) Monnier
8f730f70cb
mix.exs: 2.4.50 2021-08-08 16:00:10 +02:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0 2021-08-01 08:26:39 +02: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