Commit Graph

340 Commits

Author SHA1 Message Date
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Egor Kislitsyn
a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
#   config/config.exs
#   docs/config.md
2019-04-08 09:18:01 +00:00
eugenijm
2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
Alex S
7410aee886 Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
Egor Kislitsyn
f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
Ivan Tashkinov
47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Mark Felder
66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld
3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
Mark Felder
7222afe01b Clean merge crumbs 2019-04-04 12:29:10 -05:00
href
7e930559fe Serve metrics at /api/pleroma/app_metrics 2019-04-04 12:27:44 -05:00
Egor Kislitsyn
0b5c818cb7 [#1] fix telemetry 2019-04-04 11:35:09 -05:00
href
bc3618a38d Set up telemetry and prometheus 2019-04-04 11:30:43 -05:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Ivan Tashkinov
590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-02 13:50:12 +03:00
Alex S
08d64b977f little changes and typos 2019-04-02 16:13:34 +07:00
Alex S
9b2188da7c refactoring of emoji tags config to use groups 2019-04-02 15:44:56 +07:00
Alex S
3601f03147 Adding tag to emoji ets table
changes in apis
2019-04-01 17:17:57 +07:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
Mark Felder
d5a1e08bf1 Add default mail adapter settings to config 2019-03-31 17:46:17 -05:00
lain
10fdc080a0 BBS: Tests and formatting. 2019-03-31 20:35:10 +02:00
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
Ivan Tashkinov
2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +03:00
kaniini
1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.

See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Ivan Tashkinov
81bf6d9e6a [#923] Typo fix. 2019-03-20 20:29:08 +03:00
Ivan Tashkinov
af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
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
2019-03-18 10:26:41 +03:00
kaniini
8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
rinpatch
28cfb2c37a Enable dedupe by default 2019-03-15 12:11:13 +03:00
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
link0ff
9338f061a3 Support LDAP method start_tls 2019-03-12 18:20:02 +02:00
Ivan Tashkinov
63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03:00
kaniini
46200d8fac Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.

Closes #708

See merge request pleroma/pleroma!892
2019-03-08 22:53:12 +00:00
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
Maksim
bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Haelwenn (lanodan) Monnier
a283a1fcd0
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
2019-03-06 02:26:14 +01:00
Egor Kislitsyn
eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07:00
KokaKiwi
b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy. 2019-03-04 11:30:26 +01:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02:00
William Pitcock
6b2a1ad1c8 config: fix chat endpoint path 2019-02-28 17:00:54 +00:00
William Pitcock
9aec00d711 config: update config for cowboy 2 endpoints 2019-02-28 15:44:12 +00:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
link0ff
e278d47023 OpenLDAP support 2019-02-22 15:03:43 +02:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop'
Job Queue

See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
lain
d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +01:00
Karen Konou
d943c90249 Add tests, change default config values, fix a bug 2019-02-15 12:47:50 +01:00
Haelwenn (lanodan) Monnier
71ce564ecc
config/dev.exs: Don’t put secure cookies on dev 2019-02-12 21:50:47 +01:00
Egor Kislitsyn
305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
rinpatch
6c21f5aa16 Merge branch 'develop' into feature/keyword-policy 2019-02-08 13:12:33 +03:00
rinpatch
8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy 2019-02-08 13:12:09 +03:00
rinpatch
2174f6eb4f Add default config for keyword policy 2019-02-08 12:48:39 +03:00
Michael Loftis
43b3f9e96e rids the duplicate timestamp from default ExSyslogger config 2019-02-06 17:34:09 +00:00
Egor Kislitsyn
3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
rinpatch
89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop'
Improve hellthread filter

Closes #584

See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
Karen Konou
0ef0ae35ab added optional delist feature 2019-02-03 20:12:23 +01:00
lain
e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
href
b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
rinpatch
7057891db6 Make rich media support toggleable 2019-01-31 18:18:20 +03:00
Egor Kislitsyn
d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07:00
href
4aff4efa8d
Use multiple hackney pools
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)

Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.

splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
2019-01-30 15:06:46 +01:00
kaniini
d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
Egor Kislitsyn
55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov
1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
lain
39b2457734 Change default bg image in new config. 2019-01-28 13:04:51 +01:00
Ivan Tashkinov
656ed7c84a [#534] Configurable outgoing federation reachability timeout. 2019-01-25 15:10:21 +03:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
rinpatch
74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
rinpatch
a38f21f51d unfurl_nsfw: false by default 2019-01-18 18:30:06 +03:00
Mark Felder
207489aa25 Also add to default config 2019-01-17 15:50:34 +00:00
rinpatch
76f80940da oops 2019-01-16 17:19:01 +03:00
rinpatch
ff6c9a5c96 Introduce get_by_id in Activity, replace newlines with spaces 2019-01-15 20:00:21 +03:00
rinpatch
e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
kaniini
7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
Mark Felder
5419b1a030 Alpha sort the restricted nicknames 2019-01-10 00:06:03 +00:00
Egor Kislitsyn
28afcb7c31 move defaults from sample_config.exs to config.exs 2019-01-09 17:02:30 +07:00
lain
0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01:00
Haelwenn (lanodan) Monnier
c9b99d4486
config/config.exs: Add syslog backends 2019-01-06 01:11:53 +01:00
href
53f56039e5
Remove media proxy examples in config/config.exs
1. this was overriding the real defaults
2. it's documented in `config/config.md`
2019-01-03 20:22:22 +01:00
rinpatch
b73a1a33de Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
rinpatch
9ef664ffce Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.

See merge request pleroma/pleroma!619
2019-01-03 08:59:05 +00:00
rinpatch
d1983ed028 Merge branch 'fix/reserve-media-username' into 'develop'
Reserve /media

See merge request pleroma/pleroma!620
2019-01-02 16:23:46 +00:00
Rin Toshaka
5142b50f39 reserve /media 2019-01-02 17:16:26 +01:00
lain
8910e103ce Add handler for Phoenix-style socket. 2019-01-02 11:39:11 +01:00
lain
400337b0a7 Make Federator options configurable. 2019-01-01 14:46:55 +01:00
kaniini
3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
lambda
9c782e59dd Raise remote limit 2018-12-28 18:57:50 +00:00
Ekaterina Vaartis
448af3601a Up captcha timer to 60 secs again, save used captchas in cachex 2018-12-27 00:16:43 +03:00