Roman Chvanikov
795a5fe441
Add delete_attachments queue to config
5 years ago
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
e699861690
full update for some subkeys
5 years ago
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Mark Felder
89243fee8e
Fix captcha time, which was meant to be 5 minutes
5 years ago
Egor Kislitsyn
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
5 years ago
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
157bceeda9
Move runtime configuration from `:instance` to `:modules`
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
5 years ago
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
d55859f5a4
remove `quantum` package
5 years ago
Maksim Pechnikov
a4f834a687
moved DigestEmail to Oban Periodic jobs
5 years ago
Maksim Pechnikov
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
5 years ago
Maksim Pechnikov
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
5 years ago
Maksim Pechnikov
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
5 years ago
Maksim Pechnikov
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
Sadposter
d3656c2725
add ability to set a custom user-agent string
5 years ago
Mark Felder
c65190c799
Console backend's log format should be prefixed and suffixed with newlines.
...
This is how upstream does it by default.
5 years ago
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
5 years ago
Ariadne Conill
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
lain
72cc92259e
Default config: Use extended nickname format
5 years ago
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
lain
e08bd99bab
Apply suggestion to config/config.exs
5 years ago
lain
4885d403fe
Apply suggestion to config/config.exs
5 years ago
Maksim Pechnikov
9d0b989521
add subject to atom feed
5 years ago
Phil Hagelberg
886a07ba57
Move static_fe config to its own section instead of in :instance.
5 years ago
rinpatch
2f4e9a068f
Bump fast_sanitize to 0.1.1
...
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
5 years ago
rinpatch
9434e151a9
Blacklist myhtmlex nodes from swarm
5 years ago
rinpatch
05d111b622
Use the default scrubber before mediaproxy transformation
5 years ago
KokaKiwi
638457ba94
MastoFE: Add PWA manifest.
5 years ago
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Mark Felder
b8b98ac40f
Add missing extended_nickname_format setting to the default config
5 years ago
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
Rachel Fae Fox
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
5 years ago
Egor Kislitsyn
cf3041220a
Add support for `rel="ugc"`
5 years ago
Ekaterina Vaartis
ee620ecbf1
Add caching for emoji pack sharing
5 years ago
Ivan Tashkinov
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
5 years ago
Egor Kislitsyn
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
)
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
Egor Kislitsyn
66c1966688
Disable rate limiter by default
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
aries
e5f76a54e6
Fix default config of account fields length
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
lain
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
Egor Kislitsyn
8d899d6197
Add `:ap_routes` rate limit
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
Egor Kislitsyn
158231cd20
Add configurable colors and logo for the digest template
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn
a2e1db5632
Increase max account fields limits
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
5 years ago
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
Ariadne Conill
3fdbeb7087
MRF: add vocabulary policy module
5 years ago
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Egor Kislitsyn
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Mike Verdone
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
Ariadne Conill
b2a8ccf37f
config: add sign_object_fetches option
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Alex S
f4447d82b8
parsers configurable
5 years ago
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
5 years ago
kaniini
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
5 years ago
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch
fa7e0c4262
Workaround for remote server certificate chain issues
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Alex S
59e16fc45a
enable synchronization by default
5 years ago
Alex S
beba7bbc85
removing synchronization worker
5 years ago
Maksim
12b1454245
[ #1062 ] added option to disable send email
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
Haelwenn
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
5 years ago
rinpatch
682f1897b7
Enable OpenGraph and TwitterCard by default
...
Closes #1034
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Mark Felder
f8ec3e129f
In my experience syslog tags are usually lowercase
5 years ago
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
rinpatch
875100de01
Bind to 127.0.0.1 instead of 0.0.0.0 by default
5 years ago
rinpatch
f30a3241d2
Deps: Update auto_linker
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
Hakaba Hitoyo
5d5a9a3a35
Better default parameters for suggestion
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
bc8f059367
Add rate limiting for search endpoints
5 years ago
lain
593b8b1e6a
Configuration: Skip thread containment by default
...
In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example.
5 years ago
Roman Chvanikov
c0fa000147
Set default config for digest to false
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
rinpatch
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
kaniini
a536f515dd
Merge branch 'ueberauth_config_extension' into 'develop'
...
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
Ivan Tashkinov
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
William Pitcock
561a21986d
formatting
5 years ago
William Pitcock
4087ccdab8
mrf: add subchain policy
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
William Pitcock
9bec891eb4
kill @httpoison
5 years ago
William Pitcock
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
William Pitcock
16b260fb19
add mix task to prune the object database using a configured retention period
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
Mark Felder
75c7bb9289
Additional reserved usernames
5 years ago
Sadposter
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
5 years ago
William Pitcock
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
lain
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
lain
e39c190f04
Configuration: disable migration lock.
5 years ago
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
lambda
0992094bd6
Merge branch 'cleanup' into 'develop'
...
Remove unused queue from the config
See merge request pleroma/pleroma!1158
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
rinpatch
153c15cdb2
Merge branch 'legacy-fe-config' into 'develop'
...
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
5 years ago
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn
6c9f45f4dd
Remove unused queue from the config
5 years ago
William Pitcock
071f78733a
switch to pleroma/http_signatures library
5 years ago
rinpatch
38f3393e93
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
...
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
William Pitcock
fedaca15a3
websub: adapt to work as a federator publishing module
5 years ago
William Pitcock
179293e51c
salmon: refactor to work as a federator publishing module
5 years ago
William Pitcock
10695a28d2
federator: publisher: add publish() wrapper
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alex S
f46295faa7
unused config paramater
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
William Pitcock
501af917b5
add support for bbcode
5 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
Alex S
d35246c449
added healthcheck setting to instance config
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Ekaterina Vaartis
0d6265cfe2
Change the default manifest to pleroma's namespace
6 years ago
Roman Chvanikov
b87ad13803
Move comments for email_notifications config to docs
6 years ago
Roman Chvanikov
64a2c6a041
Digest emails
6 years ago
Ekaterina Vaartis
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis
9bd5e2dec9
Make emoji default_manifest a config option
6 years ago
Ekaterina Vaartis
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
6 years ago
Ekaterina Vaartis
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
6 years ago
Roman Chvanikov
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
Roman Chvanikov
2f0203a4a1
Resolve conflicts
6 years ago
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Hakurei Reimu
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
lain
4fecd6f9a7
Config.exs: Add big warning so that nobody ever edits it.
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
Mark Felder
7222afe01b
Clean merge crumbs
6 years ago
href
7e930559fe
Serve metrics at `/api/pleroma/app_metrics`
6 years ago
Egor Kislitsyn
0b5c818cb7
[ #1 ] fix telemetry
6 years ago
href
bc3618a38d
Set up telemetry and prometheus
6 years ago
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
Ivan Tashkinov
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Alex S
08d64b977f
little changes and typos
6 years ago
Alex S
9b2188da7c
refactoring of emoji tags config to use groups
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
d5a1e08bf1
Add default mail adapter settings to config
6 years ago
lain
10fdc080a0
BBS: Tests and formatting.
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Ivan Tashkinov
81bf6d9e6a
[ #923 ] Typo fix.
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago