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 |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
6 years ago |
|
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
|
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 |
|
eugenijm
|
b3870df51f
|
Handle `scheduled_at` on status creation.
|
6 years ago |
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
6 years ago |
|
eugenijm
|
7aa53d52bd
|
Return 403 on oauth token exchange for a deactivated user
|
6 years ago |
|
feld
|
9aeac7dcca
|
Merge branch 'feature/prometheus' into 'develop'
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
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 |
|
Sergey Suprunenko
|
325a268017
|
Redirect to the referer url after mastofe authorization
|
6 years ago |
|
Mark Felder
|
b5a2d384f7
|
Redundant Repo.get_by usage was recently removed from the codebase
|
6 years ago |
|
Roger Braun
|
7895ee37fa
|
Add user following / unfollowing to the admin api.
|
6 years ago |
|
rinpatch
|
f0f30019e1
|
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
|
6 years ago |
|
Mark Felder
|
69038887b2
|
Code readability tweak
|
6 years ago |
|
Egor Kislitsyn
|
0b5c818cb7
|
[#1] fix telemetry
|
6 years ago |
|
href
|
bc3618a38d
|
Set up telemetry and prometheus
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
af0065a71f
|
mastodon_api_controller.ex: Add pleroma-tan to initial_state
|
6 years ago |
|
lambda
|
3f8be270c6
|
Merge branch 'feature/robotstxt' into 'develop'
Generate permissive or restrictive robots.txt in the config generator
See merge request pleroma/pleroma!1012
|
6 years ago |
|
Sachin Joshi
|
cd41584ac4
|
Generate permissive or restrictive robots.txt in the config generator
|
6 years ago |
|
rinpatch
|
79cb34a4b0
|
Fix preview not being usable in form data
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
6 years ago |
|
lain
|
39bcf93007
|
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
|
6 years ago |
|
lain
|
fd07745d1b
|
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
|
6 years ago |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
6 years ago |
|
Alex S
|
d140738edf
|
second level of headertext change in doc
|
6 years ago |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
6 years ago |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
6 years ago |
|
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
6 years ago |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
6 years ago |
|
lambda
|
091baf9316
|
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
|
6 years ago |
|
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
6 years ago |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
6 years ago |
|
Egor Kislitsyn
|
88d3cb44c3
|
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
Egor Kislitsyn
|
4212527928
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
|
6 years ago |
|
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
6 years ago |
|
Egor Kislitsyn
|
a14742f495
|
add `user delete_activities` mix task
|
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 |
|
Egor Kislitsyn
|
a1869f5272
|
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
|
6 years ago |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
6 years ago |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f56eef8d8c
|
router: Add fake identity proof endpoint
|
6 years ago |
|
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
6 years ago |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
6 years ago |
|
Ivan Tashkinov
|
6910fb371b
|
Fixed local MastoFE authentication / `force_login` option.
|
6 years ago |
