Egor Kislitsyn
|
d0304b4f92
|
more tests
|
2019-04-12 16:51:28 +07:00 |
|
Egor Kislitsyn
|
dd097a406b
|
add tests
|
2019-04-12 16:38:32 +07:00 |
|
Egor Kislitsyn
|
46bd5c1d87
|
fix format
|
2019-04-11 17:28:12 +07:00 |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
2019-04-11 17:22:42 +07:00 |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-04-11 15:51:52 +07:00 |
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
2019-04-10 10:10:08 +00:00 |
|
lambda
|
6504b43f96
|
Merge branch 'feature/user-status-subscriptions' into 'develop'
Add ability to subscribe to users
See merge request pleroma/pleroma!1024
|
2019-04-10 10:04:20 +00:00 |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
2019-04-10 10:44:54 +01:00 |
|
lambda
|
c8440b5e0c
|
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
|
2019-04-10 06:22:51 +00:00 |
|
kaniini
|
0ab563d334
|
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
|
2019-04-10 02:10:47 +00:00 |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
2019-04-10 02:10:31 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cf9ba8fe1b
|
transmogrifier.ex: Add fix_summary/1
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
|
2019-04-10 02:32:04 +02:00 |
|
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
2019-04-09 23:20:31 +03:00 |
|
rinpatch
|
144648de92
|
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
|
2019-04-09 17:25:31 +00:00 |
|
lambda
|
0a02ed7a2f
|
Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
|
2019-04-09 07:30:38 +00:00 |
|
Sachin Joshi
|
07afb9b537
|
update the follower count when a follower is blocked
|
2019-04-09 09:15:45 +05:45 |
|
Sadposter
|
589629cf3e
|
Used cached user resources in subscriptions
|
2019-04-08 15:56:14 +01:00 |
|
Alex S
|
fee50636d0
|
removing not needed invite update
|
2019-04-08 20:08:16 +07:00 |
|
Alex S
|
d0696fdfd6
|
fix for elixir 1.7.4
|
2019-04-08 19:16:59 +07:00 |
|
Sadposter
|
87a01f9ee0
|
Use Pleroma.Config instead of Application.get_env
|
2019-04-08 13:04:30 +01:00 |
|
lambda
|
4977e96fa4
|
Merge branch 'use-jobs-in-webpush' into 'develop'
Use PleromaJobQueue in Pleroma.Web.Push
See merge request pleroma/pleroma!1023
|
2019-04-08 11:53:18 +00:00 |
|
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 18:48:10 +07:00 |
|
Sadposter
|
13ff312c48
|
Sever subscription in case of block
|
2019-04-08 12:46:12 +01: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 |
|
lambda
|
fd45cab9ec
|
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
2019-04-08 11:41:50 +00:00 |
|
lambda
|
ff9290836b
|
Merge branch 'feature/697-language-tag-metadata' into 'develop'
adding language tag
See merge request pleroma/pleroma!1034
|
2019-04-08 11:03:10 +00:00 |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
2019-04-08 11:03:10 +00:00 |
|
Alex S
|
f0ca0696c8
|
test for valid_invite?
|
2019-04-08 17:06:04 +07:00 |
|
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 |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 16:46:59 +07:00 |
|
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
2019-04-08 12:32:55 +03: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 |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
2019-04-08 09:08:18 +00:00 |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
2019-04-08 16:01:28 +07:00 |
|
Sadposter
|
76fdfd1c7f
|
Add check on activity visibility in sub notification
|
2019-04-07 15:11:29 +01:00 |
|
Alex S
|
56c75aec12
|
credo fix
|
2019-04-07 20:59:53 +07:00 |
|
Alex S
|
b810aac117
|
added docs to docs/api/admin_api.md
code style and little renamings
|
2019-04-07 19:48:52 +07: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 |
|
|
|
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 |
|
|
|
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 |
|
Alex S
|
ce8d457132
|
little channges
|
2019-04-06 22:38:35 +07:00 |
|
Sadposter
|
e6778003ab
|
JSON need quotes!
|
2019-04-06 16:24:21 +01:00 |
|
Sadposter
|
c05fe4da0a
|
Document subscription endpoints, fix typos
Also adds a quick error case on the subscription endpoints
to avoid 500s
|
2019-04-06 16:20:06 +01:00 |
|
