Commit Graph

4501 Commits

Author SHA1 Message Date
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
lambda
b177e1e7f3 Merge branch 'scheduled-activities' into 'develop'
Scheduled activities

See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
feld
fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop'
Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +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
eugenijm
b3870df51f Handle scheduled_at on status creation. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
eugenijm
7aa53d52bd Return 403 on oauth token exchange for a deactivated user 2019-04-06 23:27:55 +03:00
feld
876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop'
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request pleroma/pleroma!1030
2019-04-06 16:03:35 +00:00
feld
9aeac7dcca Merge branch 'feature/prometheus' into 'develop'
Upstream: Metrics and debugging

See merge request pleroma/pleroma!1020
2019-04-06 14:51:46 +00:00
Mark Felder
b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Haelwenn
3c5daa0235 Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'
Redirect to the referer url after mastofe authorization

Closes #717

See merge request pleroma/pleroma!1025
2019-04-05 23:36:42 +00:00
Sergey Suprunenko
325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Sergey Suprunenko
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS 2019-04-05 22:48:11 +02:00
rinpatch
e3ca9f708f Merge branch 'revert-8607ae68' into 'develop'
Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028
2019-04-05 20:04:16 +00:00
rinpatch
e5df8cadea Revert "Merge branch 'test-coverage' into 'develop'"
This reverts merge request !1027
2019-04-05 19:59:03 +00:00
rinpatch
8607ae6841 Merge branch 'test-coverage' into 'develop'
Use --cover option when running CI tests

See merge request pleroma/pleroma!1027
2019-04-05 19:49:20 +00:00
optikfluffel
fb1be1d798 Use --cover option when running CI tests 2019-04-05 20:12:44 +02:00
feld
3fb3f42e77 Merge branch 'feature/admin-api-follow' into 'develop'
Feature/admin api follow

See merge request pleroma/pleroma!1026
2019-04-05 17:15:55 +00:00
Mark Felder
fac76bfa35 We actually want the user id not nickname in the test... 2019-04-05 12:11:19 -05:00
Mark Felder
c746087f57 Also remove Repo functions in the tests 2019-04-05 11:59:56 -05:00
Mark Felder
b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase 2019-04-05 11:41:41 -05:00
Mark Felder
da64a5aece Document the admin API endpoints for controlling follow/unfollow 2019-04-05 11:29:34 -05:00
Roger Braun
7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
lambda
5499750054 Merge branch 'hotfix/html-sanitization' into 'develop'
Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi

See merge request pleroma/pleroma!1022
2019-04-05 12:43:57 +00:00
rinpatch
f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi 2019-04-05 15:19:44 +03:00
Mark Felder
66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld
9c9eec62c2 Merge branch 'feature/quack' into 'develop'
Add ability to ship logs to a Slack channel

See merge request pleroma/pleroma!1014
2019-04-04 19:52:22 +00:00
feld
3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
Mark Felder
69038887b2 Code readability tweak 2019-04-04 12:36:57 -05: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
Mark Felder
5564cd421d Document Prometheus 2019-04-04 12:19:31 -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
href
b655a8ea83 Add recon 2019-04-04 11:22:30 -05:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
lambda
3c7f5bb1dc Merge branch 'fix/add-oauth-token-indexes' into 'develop'
adding indexes to oauth_tokens table

See merge request pleroma/pleroma!1016
2019-04-04 08:01:12 +00:00
lambda
c900ff39af Merge branch 'features/pleroma-tan-mastofe' into 'develop'
mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request pleroma/pleroma!1018
2019-04-04 07:34:20 +00:00
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state 2019-04-04 09:07:25 +02:00
lambda
3f8be270c6 Merge branch 'feature/robotstxt' into 'develop'
Generate permissive or restrictive robots.txt in the config generator

See merge request pleroma/pleroma!1012
2019-04-03 17:31:34 +00:00
Sachin Joshi
cd41584ac4 Generate permissive or restrictive robots.txt in the config generator 2019-04-03 22:12:58 +05:45
lambda
9bb122d5a7 Merge branch 'update-autolinker' into 'develop'
Update `auto_linker` dependency

See merge request pleroma/pleroma!1015
2019-04-03 14:42:59 +00:00
Alex S
86f90c0a54 adding indexes to oauth_tokens table 2019-04-03 20:51:09 +07:00
Egor Kislitsyn
d313a0c49c Update auto_linker dependency 2019-04-03 19:41:15 +07:00
lambda
7c003991d6 Merge branch 'fix/preview-not-working-with-form-data' into 'develop'
Fix preview not being usable in form data

See merge request pleroma/pleroma!1013
2019-04-03 06:51:44 +00:00
rinpatch
79cb34a4b0 Fix preview not being usable in form data 2019-04-02 23:07:16 +03:00
Haelwenn
0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.

See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
lambda
256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format

Closes #763

See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
lambda
a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit

See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00