sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4883 commits 2 branches 40 tags 290 MiB
Commit graph

94 commits

Author SHA1 Message Date
lain
6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
xse
2982061dfa Fix syntax highlighting + clarify :frontend_configuration 2019-05-01 01:26:14 +02:00
Mark Felder
24c3e2db2c Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
kaniini
7dcac0bac0 Merge branch 'develop' into 'develop' 
Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087
 2019-04-23 02:41:21 +00:00
ilja
74ef14b04e Add :emoji settings to config.md 2019-04-22 19:42:02 +02:00
Alex S
d35246c449 added healthcheck setting to instance config 2019-04-22 17:00:06 +07:00
Ekaterina Vaartis
8f93d4c423 Remove most finmoji mentions where appropriate 2019-04-20 15:42:14 +03:00
Alexander Strizhakov
ada384207b typo fix 
docs for RelMe provider
 2019-04-19 07:50:21 +00:00
kaniini
73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' 
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
 2019-04-16 18:44:07 +00:00
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`.
 2019-04-16 22:20:56 +08:00
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
 2019-04-13 12:24:38 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
Egor Kislitsyn
9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
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
 2019-04-08 11:42:20 +00:00
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +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
Ivan Tashkinov
e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. 2019-04-07 11:08:37 +03: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
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
feld
3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
rinpatch
e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way 2019-04-01 19:24:50 +03:00
rinpatch
a309b49c2d Remove outdated howto change config and port and move it to config.md instead 2019-04-01 19:19:06 +03:00
lain
3fc4ea45df BBS: Add documentation. 2019-03-31 18:14:51 +02:00
rinpatch
afbc905a1c qs 2019-03-29 16:38:18 +03:00
rinpatch
11584488d1 Improve PleromaJobQeue config documentation 2019-03-29 16:11:22 +03:00
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00: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
Quentin Rameau
80bc9ed2ba Add a gopher url port config option 
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
 2019-03-21 19:59:43 +03:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01: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
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
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03: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
link0ff
88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well 2019-03-03 21:20:36 +02:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02: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
27375e5575 WelcomeMessage: specify that the user has to be local. 2019-02-16 17:25:06 +01:00
lain
d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +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
9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03:00