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 |
|
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 |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
2019-04-02 12:18:00 +05:45 |
|
Ivan Tashkinov
|
aac48d0cc6
|
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
|
2019-04-02 09:19:10 +03:00 |
|
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
|
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
|
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 |
|
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 |
|
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
|
debf7f016d
|
ostatus: use preload objects with Object.normalize() when opportunistic
|
2019-03-23 03:05:57 +00:00 |
|
William Pitcock
|
8c70156157
|
activitypub: object view: use preloaded object when possible
|
2019-03-23 03:05:14 +00:00 |
|
William Pitcock
|
ce47eb8b29
|
activitypub: when fetching objects, use the preloaded object from the synthesized activity
|
2019-03-23 03:05:10 +00:00 |
|
William Pitcock
|
07cdd9ed02
|
streamer: use the preloaded object if possible
|
2019-03-23 02:29:01 +00:00 |
|
William Pitcock
|
c62220c500
|
rich media: helpers: only crawl Create activities
|
2019-03-23 02:28:59 +00:00 |
|
William Pitcock
|
4cedf45423
|
relay: use preloaded object since we always have it
|
2019-03-23 02:28:56 +00:00 |
|
William Pitcock
|
e430a71d37
|
ostatus: fetch preloaded object in note handler for testsuite
|
2019-03-23 01:17:26 +00:00 |
|
William Pitcock
|
73efe95368
|
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
|
2019-03-23 01:09:12 +00:00 |
|
William Pitcock
|
ba7299fc87
|
activitypub: add missing with_preloaded_object()
|
2019-03-23 00:53:35 +00:00 |
|
William Pitcock
|
e4307cadc8
|
activitypub: splice in the child object if we have one
|
2019-03-23 00:40:08 +00:00 |
|
William Pitcock
|
a6973a668e
|
formatting
|
2019-03-23 00:28:16 +00:00 |
|
William Pitcock
|
b3bf523c09
|
rich media: use optimized Object.normalize()
|
2019-03-23 00:22:57 +00:00 |
|
William Pitcock
|
e75e43b949
|
common api: use the optimized Object.normalize whenever possible
|
2019-03-23 00:22:14 +00:00 |
|
William Pitcock
|
9aea7cc224
|
activitypub: preload child objects when fetching timelines
|
2019-03-23 00:10:17 +00:00 |
|
rinpatch
|
1b33986bfa
|
Fix text being nullable in TwitterAPI
|
2019-03-23 00:10:50 +03:00 |
|
lambda
|
fee360e581
|
Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
|
2019-03-22 11:03:56 +00:00 |
|
lain
|
e2afce34b6
|
NodeInfo: Return safe_dm_mentions feature flag.
|
2019-03-22 11:57:20 +01: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 |
|
William Pitcock
|
3cc2554fa3
|
mastodon api: add conversation_id extension (ref #674)
|
2019-03-21 23:25:41 +00:00 |
|
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
2019-03-21 23:24:04 +00:00 |
|
rinpatch
|
b92a16aa00
|
Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
|
2019-03-21 16:24:57 +00:00 |
|
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
2019-03-21 16:20:58 +01:00 |
|
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
2019-03-20 21:09:36 +01:00 |
|
Ivan Tashkinov
|
af68a42ef7
|
[#923] Support for multiple OAuth consumer strategies.
|
2019-03-20 20:25:48 +03:00 |
|
rinpatch
|
9a7b817c9a
|
Ecto 3.0.5 migration
kms
|
2019-03-20 15:59:54 +03:00 |
|
Ivan Tashkinov
|
e17a9a1f66
|
[#923] Nickname & email selection for external registrations, option to connect to existing account.
|
2019-03-20 10:35:31 +03:00 |
|
William Pitcock
|
1685e4258f
|
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
|
2019-03-19 18:39:33 +00:00 |
|
William Pitcock
|
cd055983c3
|
transmogrifier: when determining followers collection URI, we may need to fetch the actor
|
2019-03-19 18:04:57 +00:00 |
|
William Pitcock
|
d487b753c3
|
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
|
2019-03-19 17:30:25 +00:00 |
|
William Pitcock
|
798da28812
|
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
|
2019-03-19 17:27:42 +00:00 |
|
Ivan Tashkinov
|
8d21859717
|
[#923] External User registration refactoring, password randomization.
|
2019-03-18 18:09:53 +03:00 |
|
Ivan Tashkinov
|
26b6354095
|
[#923] Support for multiple (external) registrations per user via Registration.
|
2019-03-18 17:23:38 +03:00 |
|
eugenijm
|
1588688a11
|
Added support for exclude_types, limit, and min_id in Mastodon
notifications.
Unify Mastodon-compatible pagination logic.
|
2019-03-18 11:27:27 +03:00 |
|
Ivan Tashkinov
|
2a96283efb
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
|
2019-03-18 10:26:41 +03:00 |
|
Haelwenn (lanodan) Monnier
|
f6fab01ba7
|
Web.Router: Add routes for Conversation mastoAPI
|
2019-03-17 17:06:28 +01:00 |
|
kaniini
|
6d6f48d079
|
Merge branch 'feature/federated-flags' into 'develop'
Federated reports
See merge request pleroma/pleroma!935
|
2019-03-16 19:27:56 +00:00 |
|
lambda
|
28df397454
|
Merge branch 'feature/oauth-me' into 'develop'
oauth: add me property to token responses
See merge request pleroma/pleroma!942
|
2019-03-16 08:44:02 +00:00 |
|
kaniini
|
c69dc2acf1
|
Merge branch 'feature/reblog-muting' into 'develop'
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
|
2019-03-16 04:31:31 +00:00 |
|
William Pitcock
|
e0edc706cf
|
oauth: add me property to token responses
|
2019-03-16 01:12:50 +00:00 |
|
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
2019-03-15 23:56:14 +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 |
|
Ivan Tashkinov
|
2739057442
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
|
2019-03-15 17:11:00 +03:00 |
|
Ivan Tashkinov
|
aacbf0f570
|
[#923] OAuth: prototype of sign in / sign up with Twitter.
|
2019-03-15 17:08:03 +03:00 |
|
|
|
d8244c2a1b
|
remove unused function
|
2019-03-15 15:03:03 +01:00 |
|
|
|
dfeb3aec44
|
fix credo warning
|
2019-03-15 14:36:07 +01:00 |
|
|
|
da53c079db
|
Refactor to store user ap_id, add tests
|
2019-03-15 14:20:08 +01:00 |
|
|
|
be465c762b
|
formatting
|
2019-03-15 14:18:53 +01:00 |
|
|
|
15b21d1983
|
refactor filtering mechanism
|
2019-03-15 14:18:53 +01:00 |
|
|
|
aa71139e4a
|
Fix elixir 1.8 vs 1.7 format conflict
|
2019-03-15 14:18:53 +01:00 |
|
