lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
2019-04-08 09:50:00 +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 |
|
Mark Felder
|
66e7b03372
|
Merge branch 'develop' into feature/prometheus
|
2019-04-04 15:39:42 -05:00 |
|
|
|
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 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07: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 |
|
Mark Felder
|
d5a1e08bf1
|
Add default mail adapter settings to config
|
2019-03-31 17:46:17 -05: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 |
|
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
2019-03-20 21:09:36 +01:00 |
|
rinpatch
|
9a7b817c9a
|
Ecto 3.0.5 migration
kms
|
2019-03-20 15:59:54 +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 |
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
