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
Alexander Strizhakov
ef5b0510eb
updating timex
2021-03-20 08:29:02 +03:00
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
Ivan Tashkinov
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
lain
0a589c887b
Mix: Update linkify.
2021-03-02 17:03:14 +01:00
Mark Felder
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
2021-01-28 14:03:29 -06:00
Mark Felder
d2382ab5f4
Update Oban to 2.3.4
2021-01-15 15:01:48 -06:00
Mark Felder
a1a58f0a53
Switch to local fork of crypt until upstream fixes ability to build on aarch64
...
https://github.com/msantos/crypt/pull/8
2020-12-28 17:52:18 -06:00
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
Mark Felder
5b838accc0
Update Linkify to 0.4.1
...
Fixes false positive detection of IPv4 addresses
2020-12-23 09:07:01 -06:00
Alexander Strizhakov
dedc575225
update for retired elixir_make package version
2020-12-22 17:42:23 +03:00
lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
rinpatch
f687befb93
Merge branch 'fix/hackney-follow-redirects' into 'develop'
...
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
Closes #2342
See merge request pleroma/pleroma!3199
2020-12-13 12:16:41 +00:00
Mark Felder
7d78c00049
Majic: specify commit so source users do not get surprise updates
2020-12-12 13:04:16 -06:00
Mark Felder
3299fea9e3
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
2020-12-12 13:01:30 -06:00
Mark Felder
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
2020-12-11 17:23:03 -06:00
Alex Gleason
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
Mark Felder
45949b5cd3
Update Linkify to 0.4.0
2020-12-01 17:26:25 -06:00
Mark Felder
60c8c5402c
Update Linkify to 0.3.0
...
Added
- Support returning result as iodata and as safe iodata
Fixed
- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
2020-11-23 11:22:50 -06:00
rinpatch
83ec4aadd6
Merge branch 'chores/tesla_1.4.0' into 'develop'
...
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
2020-11-17 12:42:51 +00:00
Haelwenn (lanodan) Monnier
3f69680ed9
mix.exs: Update tesla to 1.4.0
2020-11-17 13:09:56 +01:00