Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
2021-06-04 14:42:44 -06:00 |
|
Haelwenn
|
0c56f9de0d
|
Merge branch 'tests/openapi-everywhere' into 'develop'
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
|
2021-06-04 18:53:09 +00:00 |
|
|
|
a07310888f
|
Merge branch 'fix/missing-deprecation' into 'develop'
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
|
2021-06-04 17:37:30 +00:00 |
|
|
|
f58928cf1c
|
Add missing deprecation warning left out of !2842
|
2021-06-04 12:30:10 -05:00 |
|
Haelwenn (lanodan) Monnier
|
24d66b60a0
|
request_builder_test: mode :read got removed
|
2021-06-03 19:11:17 +02:00 |
|
Haelwenn (lanodan) Monnier
|
5c3a0dd26e
|
factory: Fix article_factory
|
2021-06-03 19:11:16 +02:00 |
|
|
|
d9513b11d3
|
Forgot to move migration test when rebasing
|
2021-06-01 11:49:47 -05:00 |
|
|
|
9ce2c017c0
|
We want clear_config/2 in all tests now
|
2021-06-01 11:49:47 -05:00 |
|
Roman Chvanikov
|
d7dfa6d27c
|
Update test for RenameInstanceChat migration
|
2021-06-01 11:49:47 -05:00 |
|
Mark Felder
|
01f796f8bb
|
Add a test for the migration
|
2021-06-01 11:49:47 -05:00 |
|
Mark Felder
|
d6432a65da
|
Move shout configuration from :instance, update docs and changelog
|
2021-06-01 11:49:46 -05:00 |
|
Mark Felder
|
ff00b354fa
|
Rename the non-federating Chat feature to Shout
|
2021-06-01 11:49:14 -05:00 |
|
Alex Gleason
|
c435de426d
|
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
|
2021-06-01 11:33:11 -05:00 |
|
|
|
0ddf492c5d
|
Merge branch 'cycles-base-url' into 'develop'
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
|
2021-06-01 16:15:27 +00:00 |
|
Haelwenn
|
c4b4258374
|
Merge branch 'features/validators-note' into 'develop'
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
|
2021-06-01 01:51:38 +00:00 |
|
Alex Gleason
|
f2134e605b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
|
2021-05-31 16:49:46 -05:00 |
|
Alex Gleason
|
51a9f97e87
|
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
|
2021-05-31 16:48:03 -05:00 |
|
Alex Gleason
|
10dfe81479
|
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
Move as_local_public/0 to stop making modules depend on Web at compile-time
|
2021-05-31 13:39:15 -05:00 |
|
|
|
8871ca5aa3
|
Merge branch 'cycles-router-api-routes' into 'develop'
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
|
2021-05-28 19:06:49 +00:00 |
|
|
|
359ded086c
|
Merge branch 'simplepolicy-announce-leak' into 'develop'
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
|
2021-05-28 19:05:13 +00:00 |
|
Alex Gleason
|
39127f15eb
|
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
|
2021-05-28 13:51:21 -05:00 |
|
Alex Gleason
|
c23b81e399
|
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
Reduce recompilation time by breaking compile-time cycles
|
2021-05-28 13:51:01 -05:00 |
|
|
|
4694853766
|
Provide totalItems field for featured collections
|
2021-05-27 12:17:31 -05:00 |
|
Haelwenn
|
f34e22bba2
|
Merge branch 'feat/expose_email_to_self' into 'develop'
Expose user email address to user/owner; not publicly.
See merge request pleroma/pleroma!3412
|
2021-05-26 18:04:23 +00:00 |
|
|
|
fe40f6f291
|
Switch from the deprecated "use Mix.config" to "import Config"
|
2021-05-20 14:02:58 -05:00 |
|
|
|
05d678c070
|
Expose user email address to user/owner; not publicly.
|
2021-05-20 12:50:43 -05:00 |
|
|
|
9b6b5ac196
|
Rename upload filter to AnalyzeMetadata
|
2021-05-18 15:33:33 -05:00 |
|
Alex Gleason
|
ff02511057
|
Merge remote-tracking branch 'upstream/develop' into attachment-meta
|
2021-05-12 20:10:52 -05:00 |
|
Alex Gleason
|
4c060ae733
|
Ingest remote attachment width/height
|
2021-05-12 15:38:49 -05:00 |
|
Alex Gleason
|
ab9eabdf20
|
Add SetMeta filter to store uploaded image sizes
|
2021-05-12 15:07:31 -05:00 |
|
Alex Gleason
|
cea44b6b3e
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
2021-05-07 12:40:45 -05:00 |
|
|
|
745375bdcf
|
Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
|
2021-05-04 13:30:00 +00:00 |
|
Alex Gleason
|
c186b059a7
|
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
|
2021-05-03 14:43:28 -05:00 |
|
Alex Gleason
|
c80b1aaf51
|
Don't crash when email settings are invalid
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
|
2021-05-03 14:43:14 -05:00 |
|
Alex Gleason
|
926a233cc4
|
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
|
2021-04-30 14:21:17 -05:00 |
|
Alex Gleason
|
c16c7fdb87
|
SimplePolicy: filter string Objects
|
2021-04-30 14:20:54 -05:00 |
|
Alex Gleason
|
3d742c3c1a
|
SimplePolicy: filter nested objects
|
2021-04-30 14:20:37 -05:00 |
|
Alex Gleason
|
52fc59f125
|
Merge remote-tracking branch 'upstream/develop' into earmark
|
2021-04-30 13:17:03 -05:00 |
|
Alex Gleason
|
a8fa00ef66
|
Fix failing remote mentions test, valid TLDs
|
2021-04-30 12:55:43 -05:00 |
|
Alex Gleason
|
53760d2cda
|
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
|
2021-04-30 12:51:18 -05:00 |
|
Alex Gleason
|
6727a3659f
|
Remove Pleroma.Formatter.minify/2
|
2021-04-30 12:27:06 -05:00 |
|
Alex Gleason
|
e7ac15905e
|
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
|
2021-04-29 12:19:10 -05:00 |
|
rinpatch
|
15f87cf658
|
Merge branch 'features/ingestion-ecto-tag' into 'develop'
TagValidator: New
See merge request pleroma/pleroma!3244
|
2021-04-16 09:55:55 +00:00 |
|
rinpatch
|
79376b4afb
|
Merge branch 'feature/521-pinned-post-federation' into 'develop'
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
|
2021-04-16 09:53:47 +00:00 |
|
rinpatch
|
0ababdc068
|
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
|
2021-04-16 09:50:26 +00:00 |
|
Sean King
|
fa2e62078c
|
Remove MastoFE configuration stuff
|
2021-04-15 23:51:04 -06:00 |
|
Sean King
|
ca79aab0bf
|
Remove MastoFE settings from users table
|
2021-04-15 23:33:24 -06:00 |
|
Sean King
|
8afa3f2d1b
|
Remove no longer necessary unit tests for MastoFE
|
2021-04-15 23:12:42 -06:00 |
|
|
|
f95b52255b
|
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
|
2021-04-14 09:39:57 -05:00 |
|
|
|
905efc57e9
|
Initial test validating the AdminAPI issue
|
2021-04-13 14:39:28 -05:00 |
|
