1bb4d5d65b
Implement fake status submit
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
3ca6c4f443
password reset page labels align
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
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
6 years ago
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
3cf7539bca
Add more user filters + move search to its own module
6 years ago
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
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
6 years ago
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
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
6 years ago
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
406d19331f
Remove ActivityRepresenter
6 years ago
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
b0759f821b
Comments split.
6 years ago
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
c410296120
Try sending an empty map
6 years ago
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
6 years ago
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
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
6 years ago
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
07cdd9ed02
streamer: use the preloaded object if possible
6 years ago
c62220c500
rich media: helpers: only crawl Create activities
6 years ago
4cedf45423
relay: use preloaded object since we always have it
6 years ago
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
6 years ago
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
a6973a668e
formatting
6 years ago
b3bf523c09
rich media: use optimized Object.normalize()
6 years ago
e75e43b949
common api: use the optimized Object.normalize whenever possible
6 years ago
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
1b33986bfa
Fix text being nullable in TwitterAPI
6 years ago
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
fea3696799
common api: move context functions from twitterapi
6 years ago
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
6 years ago
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
8468f3f6d4
Add safe dm mode option.
6 years ago
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
5ba14c664b
Fix missing end brace
6 years ago
a2e03d4f3c
Initial attempt at updating return type
6 years ago
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
e0edc706cf
oauth: add me property to token responses
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
d8244c2a1b
remove unused function
6 years ago
dfeb3aec44
fix credo warning
6 years ago
da53c079db
Refactor to store user ap_id, add tests
6 years ago
be465c762b
formatting
6 years ago
15b21d1983
refactor filtering mechanism
6 years ago
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
6 years ago
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
6 years ago
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
64b0120d67
activitypub: add support for forwarding reports
6 years ago
3b48d5f0c2
common api: add support for forwarding reports
6 years ago
379442ad17
activitypub: utils: also match Activity objects
6 years ago
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
e630e5e135
Fix delete activities not federating
6 years ago
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
6 years ago
f3964f4024
Ensure empty array is returned for tags
6 years ago
257d8e78e5
Add tags
6 years ago
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
490d9cf7b1
Add "local" to users admin API
6 years ago
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
6 years ago
4b73ca638e
[Credo][CI] Add readability as it’s fixed
6 years ago
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
4c440f12c3
[Credo] Fix the consistency
6 years ago
6c8743d0c0
[Credo] Fix the warnings
6 years ago
25eb6cf1cb
Add "roles" to users admin API
6 years ago
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
9338f061a3
Support LDAP method start_tls
6 years ago
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
4aa285e6ce
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
...
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
6 years ago
07277879e5
Linting.
6 years ago
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
d9ae2d00a1
Merge branch 'feat/style-oauth-login-page' into 'develop'
...
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
6 years ago
50edead11c
Remove chromium input hilight that clashes with our own
6 years ago
8ddbedcd9a
Style again the login page to fit pleroma more
6 years ago
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
2827dfea50
Allow an admin to delete a user status
6 years ago
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
6a69ece437
Revert existing object check
6 years ago
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
28d5b40d0a
Add handling of objects not in database
6 years ago
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
6 years ago
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
6 years ago
d1de0a30cc
Include admins in nodeinfo
6 years ago
2d30fc279f
Typo
6 years ago
b7aa1ea9e6
rich media: helpers: rework validate_page_url()
6 years ago
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
6 years ago
d38d537bee
rich media: don't crawl bogus URIs
6 years ago
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
6 years ago
f620199836
Merge search endpoint into /users
6 years ago
0245ce842f
Remove unused code
6 years ago
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
6 years ago
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
6 years ago
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
6 years ago
bf43f055dd
Set content types settings on mastofe endpoint.
6 years ago
1445dc25d4
fix format
6 years ago
aab86698a5
Expand "to" of delete activities
6 years ago
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
6 years ago
dd5865535e
Merge branch 'muting' into 'develop'
...
Don't stream muted accounts
See merge request pleroma/pleroma!888
6 years ago
818a7894da
Don't stream muted accounts
6 years ago
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
6 years ago
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
6 years ago
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
6 years ago
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
6 years ago
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
6 years ago
c46950d3b1
Increment user note count only on public activities
6 years ago
2ec8cf5665
Add pagination to search
6 years ago
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
9b83236fb0
Pleroma.Web.RelMe: fixups
6 years ago
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
6 years ago
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
6 years ago
f635b675b2
Refactor a little bit
6 years ago
f1a4c3163b
Show current user in users list as well
6 years ago
5b08b470f6
Add "local" params to users search
6 years ago
689b0730f8
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
6 years ago
2f00814475
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
...
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
6 years ago
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
46f29b9da1
Add search users endpoint
6 years ago
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
6 years ago
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
6 years ago
72b7a0797e
Use Mastodon API views in Admin API
6 years ago
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
6 years ago
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
6 years ago
4e77f68414
Added `auth_template/0` to DatabaseAuthenticator.
6 years ago
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
6 years ago
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
6 years ago
b6f915313f
Made auth customization be runtime-configurable.
6 years ago
6b11011039
Added deactivated to the user view
6 years ago
2883f75a3a
Add pagination to users admin API
6 years ago
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
c4235f96bd
Add `with_muted` param.
6 years ago
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
5d961d536c
fix formatter
6 years ago
c3ac9424d2
AutoLinker
6 years ago
90d0d055fc
Add more admin actions
6 years ago
e98d34e5fb
Added missing copyright headers.
6 years ago
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
6 years ago
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
6 years ago
fc9d895ebc
twitter card: remove IO.inspect() spam
6 years ago
efa506b874
delegate user retrieval to the User module
6 years ago
e278d47023
OpenLDAP support
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
62296f5a25
Fix private post card handling.
6 years ago
afddce45b3
Minor setting name adjustment (:app_template -> :app_layout).
6 years ago
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
6 years ago
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
1097ce6d9f
Auth customization support.
...
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
6 years ago
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
...
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
6 years ago
f8a72f2997
activitypub: sign http date header
6 years ago
1803d9a022
fix fetching AP objects with application/json
6 years ago
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
6 years ago
8b08096436
logging: improve visibility into ISE errors
6 years ago
bff9eb5ef7
Reports
6 years ago
59c27f29c8
Add some nicer urls in status view.
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
6 years ago
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
6 years ago
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
6 years ago
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
f4bfc628ca
Player: allow styles on CSP, loop videos
6 years ago
aa9af1d639
CSP: Allow iframes on embed player
6 years ago
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
6 years ago
10a11f083c
Embed player suitable for Twitter Cards
6 years ago
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
f25a3f4f78
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
...
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
6 years ago
96dcacade1
properly check for follower address in is_private?
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
a39a094cda
Merge branch 'patch-image-description' into 'develop'
...
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
rinpatch