Sadposter
|
9ca91cbb87
|
Change relationship direction of subscriptions
|
2019-04-05 17:02:07 +01:00 |
|
Sadposter
|
d35f6551c1
|
Move subscriptions endpoint to be under /pleroma
|
2019-04-05 17:02:02 +01:00 |
|
Sadposter
|
d56866c824
|
Add subscribed status to user view
Added in pleroma extensions, but can be moved whenever
|
2019-04-05 15:30:31 +01:00 |
|
Sadposter
|
316fe20d86
|
Make subscriptions the same direction as blocks
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
|
2019-04-05 15:30:26 +01:00 |
|
Sadposter
|
23c4f49494
|
Fix subscription endpoint return formats
|
2019-04-05 15:30:24 +01:00 |
|
Sadposter
|
007762e767
|
Add notification checks
|
2019-04-05 15:30:23 +01:00 |
|
Sadposter
|
79910ce5cc
|
Add API endpoints and user column for subscription
|
2019-04-05 15:30:18 +01:00 |
|
Egor Kislitsyn
|
1c2e4f88d1
|
fix credo
|
2019-04-05 19:46:28 +07:00 |
|
Egor Kislitsyn
|
f1712cd2f1
|
Use PleromaJobQueue in Pleroma.Web.Push
|
2019-04-05 19:38:44 +07: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 |
|
Ivan Tashkinov
|
47a236f753
|
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
|
2019-04-05 15:12:02 +03:00 |
|
Ivan Tashkinov
|
3e7f2bfc2f
|
[#923] OAuthController#callback adjustments (with tests).
|
2019-04-05 09:19:17 +03:00 |
|
Ivan Tashkinov
|
45765918c3
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-04 23:43:08 +03:00 |
|
Ivan Tashkinov
|
f7cd9131d4
|
[#923] OAuth consumer controller tests. Misc. improvements.
|
2019-04-04 22:41:03 +03:00 |
|
Mark Felder
|
69038887b2
|
Code readability tweak
|
2019-04-04 12:36:57 -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 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Haelwenn (lanodan) Monnier
|
af0065a71f
|
mastodon_api_controller.ex: Add pleroma-tan to initial_state
|
2019-04-04 09:07:25 +02: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 |
|
lain
|
39bcf93007
|
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
|
2019-04-02 16:10:38 +02:00 |
|
lain
|
fd07745d1b
|
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
|
2019-04-02 16:08:55 +02:00 |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
2019-04-02 20:39:52 +07:00 |
|
Alex S
|
d140738edf
|
second level of headertext change in doc
|
2019-04-02 20:36:36 +07:00 |
|
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
|
2019-04-02 12:47:40 +00:00 |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
2019-04-02 12:45:29 +00:00 |
|
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
2019-04-02 12:43:28 +00:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
|
Ivan Tashkinov
|
37925cbe78
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
|
2019-04-02 14:05:34 +03:00 |
|
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
|
2019-04-02 10:57:38 +00:00 |
|
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
|
2019-04-02 10:52:29 +00:00 |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
2019-04-02 10:51:33 +00:00 |
|
Ivan Tashkinov
|
590c935d95
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-02 13:50:12 +03:00 |
|
Egor Kislitsyn
|
88d3cb44c3
|
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)
|
2019-04-02 17:47:02 +07:00 |
|
Egor Kislitsyn
|
1b3d921921
|
change Repo.get(User, id) => User.get_by_id(id)
|
2019-04-02 17:01:26 +07:00 |
|
Egor Kislitsyn
|
4212527928
|
change Repo.get(Activity, id) => Activity.get_by_id(id)
|
2019-04-02 16:50:31 +07:00 |
|
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
2019-04-02 11:32:36 +02:00 |
|
Egor Kislitsyn
|
a14742f495
|
add user delete_activities mix task
|
2019-04-02 16:30:11 +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 |
|
Egor Kislitsyn
|
a1869f5272
|
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
|
2019-04-02 15:41:30 +07:00 |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
2019-04-02 12:18:00 +05:45 |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
2019-04-02 10:26:09 +05:45 |
|
Haelwenn (lanodan) Monnier
|
f56eef8d8c
|
router: Add fake identity proof endpoint
|
2019-04-02 01:53:38 +02:00 |
|
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
2019-04-01 22:45:24 +02:00 |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
2019-04-01 22:26:58 +05:45 |
|
Ivan Tashkinov
|
6910fb371b
|
Fixed local MastoFE authentication / force_login option.
|
2019-04-01 17:25:25 +03:00 |
|
Ivan Tashkinov
|
cbe09d94d1
|
Added force_login authentication option (previously applied by default).
|
2019-04-01 14:46:50 +03:00 |
|
Alex S
|
17d3d05a71
|
code style
little fix
|
2019-04-01 17:54:30 +07:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
|
rinpatch
|
fe5145eeaa
|
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
|
2019-04-01 12:25:53 +03:00 |
|
rinpatch
|
975482f091
|
insert object defaults for fake activities and make credo happy
|
2019-04-01 12:16:51 +03:00 |
|
rinpatch
|
d866b59eea
|
oof
|
2019-04-01 11:58:08 +03:00 |
|
rinpatch
|
45ba10bf47
|
Fix the issue with HTML scrubber
|
2019-04-01 11:55:59 +03:00 |
|
Ivan Tashkinov
|
804173fc92
|
[#923] Minor code readability fix.
|
2019-04-01 09:45:44 +03:00 |
|
Ivan Tashkinov
|
eadafc88b8
|
[#923] Deps config adjustment (no override for httpoison), code analysis issues fixes.
|
2019-04-01 09:28:56 +03:00 |
|
Ivan Tashkinov
|
baffdcc480
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-01 08:49:32 +03:00 |
|
rinpatch
|
cd387f8693
|
Add a fake option to lazy_put_actvity_defaults
|
2019-03-30 13:57:54 +03:00 |
|
rinpatch
|
1bb4d5d65b
|
Implement fake status submit
|
2019-03-29 21:59:04 +03:00 |
|
Egor
|
9a39d1d846
|
Replace Pleroma.Jobs with pleroma_job_queue
|
2019-03-29 12:46:05 +00:00 |
|
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
2019-03-28 18:55:16 +03:00 |
|
eugenijm
|
55d086b520
|
Notification controls
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
|
2019-03-28 07:52:07 +03:00 |
|
eugenijm
|
10c81fc902
|
Add user show endpoint for Pleroma admin API
|
2019-03-27 21:44:15 +03:00 |
|
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
2019-03-27 15:41:40 +03:00 |
|
Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
2019-03-27 15:39:35 +03:00 |
|
lambda
|
926bf114b7
|
Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
|
2019-03-27 11:33:13 +00:00 |
|
rinpatch
|
ce6d64bbd8
|
Fix missing announces in MastoAPI home timeline
Closes #762
|
2019-03-27 12:28:53 +03:00 |
|
Maxim Filippov
|
3cf7539bca
|
Add more user filters + move search to its own module
|
2019-03-27 03:51:59 +05:00 |
|
eugenijm
|
a4ab60ac54
|
Add vapid_key to the POST /api/v1/apps response
|
2019-03-26 23:27:37 +03:00 |
|
eugenijm
|
691d1208b5
|
Add GET /api/v1/apps/verify_credentials
|
2019-03-26 21:53:28 +03:00 |
|
lambda
|
ff3b09f6b3
|
Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
|
2019-03-26 16:12:50 +00:00 |
|
lambda
|
c6ab5ebe7c
|
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
|
2019-03-26 16:01:52 +00:00 |
|
lain
|
10a7a4a868
|
AP UserView: Refactor banner / avatar display code, add test.
|
2019-03-26 16:59:28 +01:00 |
|
lambda
|
9e3899bf36
|
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
|
2019-03-26 15:13:55 +00:00 |
|
lambda
|
21ff78cd40
|
Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
|
2019-03-26 14:49:09 +00:00 |
|
rinpatch
|
406d19331f
|
Remove ActivityRepresenter
|
2019-03-26 17:16:21 +03:00 |
|
Ivan Tashkinov
|
eef1042b16
|
Mastodon 2.7.2 instance attributes (registrations, languages).
|
2019-03-26 16:27:17 +03:00 |
|
eugenijm
|
568e348588
|
Increment replies_count on replies (MastoAPI)
|
2019-03-26 15:27:04 +03:00 |
|
Ivan Tashkinov
|
b0759f821b
|
Comments split.
|
2019-03-26 15:24:29 +03:00 |
|
Ivan Tashkinov
|
263ca3dea2
|
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.
|
2019-03-26 15:09:06 +03:00 |
|
Mark Felder
|
c410296120
|
Try sending an empty map
|
2019-03-25 19:00:35 -05:00 |
|
Mark Felder
|
6f090f981b
|
Attempt to fix incorrect federation of default instance avatars
|
2019-03-25 18:47:04 -05:00 |
|
rinpatch
|
b028b0f97d
|
Merge branch 'bugfix/missing-announces' into 'develop'
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
|
2019-03-25 09:24:08 +00:00 |
|
William Pitcock
|
26b0c802c3
|
fix up missing announcements with preloads
|
2019-03-25 07:38:09 +00:00 |
|
kaniini
|
bc14c98de1
|
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
|
2019-03-25 02:25:59 +00:00 |
|
kaniini
|
63ffa4842c
|
Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
|
2019-03-25 02:24:27 +00:00 |
|
rinpatch
|
a7f58b3c13
|
Serve non-public activities in /api/v1/favourites
Fixes #648
|
2019-03-25 02:15:45 +03:00 |
|
Austin Lanari
|
6c96d68f77
|
add overriding truncated_namespace condition for truncating paths for digital ocean
|
2019-03-24 11:32:09 -07:00 |
|
rinpatch
|
750de7d842
|
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
|
2019-03-24 15:02:13 +00:00 |
|
Haelwenn (lanodan) Monnier
|
eab9425cc4
|
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
|
2019-03-24 15:47:50 +01:00 |
|
William Pitcock
|
4aa699271c
|
activity: use left join instead of inner join when fetching activities that may or may not have a child object
|
2019-03-23 03:17:50 +00:00 |
|
William Pitcock
|
332dc1371b
|
user: use preloads when deleting accounts
|
2019-03-23 03:06:00 +00:00 |
|
William Pitcock
|
debf7f016d
|
ostatus: use preload objects with Object.normalize() when opportunistic
|
2019-03-23 03:05:57 +00:00 |
|
William Pitcock
|
3c2350cbee
|
object: downgrade normalize warning to debug severity
|
2019-03-23 03:05:15 +00:00 |
|
William Pitcock
|
8c70156157
|
activitypub: object view: use preloaded object when possible
|
2019-03-23 03:05:14 +00:00 |
|
William Pitcock
|
f9d5c13b21
|
activity: add get_by_ap_id_with_object()
|
2019-03-23 03:05:13 +00:00 |
|