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
af0039a3a0
Use atomic update for note count and follower count
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
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
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
f2452d5700
Pleroma.User: mix format
6 years ago
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
6 years ago
3d22642352
Pleroma.User: Pass an array to profile_urls
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
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
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
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
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
465b547c90
Remove unused "muted" parameter, use piping for mute/block fns
6 years ago
092b1b1453
Do not unfollow muted users
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
1dd718e83c
Merge branch 'set-cache-on-user-tag-update' into 'develop'
...
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
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
f53dc5ee08
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
...
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
6 years ago
109b01a631
mark ap_id unique_constraint
6 years ago
96dcacade1
properly check for follower address in is_private?
6 years ago
fc35481445
Update user cache when user tags are updated
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
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
6 years ago
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
6 years ago
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
6 years ago
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
da44cdd381
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
...
get_or_fetch() handles the nickname verses URI differences transparently.
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
3f32d7b937
Fix queue name
6 years ago
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
72ba5b4ab7
activitypub: user view: formatting
6 years ago
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
6 years ago
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
6 years ago
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
f62c1d6266
Improve login error for OAuth flow
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
6 years ago
db8abd958d
activitypub: user view: fix up endpoints rendering
6 years ago
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
6 years ago
bef9b9cb66
refactored code
6 years ago
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
6 years ago
88a4de24f9
User.follow_all: Respect blocks in both directions.
6 years ago
760fec4cb8
Update token.ex
6 years ago
62a45bdc11
Add revoke token
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
b7bc666200
bugfix mdii uploader
6 years ago
1d727cd069
added checks for public url and follower collections
6 years ago
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
6 years ago
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
...
This is needed to run dev mode mastofe at the same time
6 years ago
c984e8272a
Formatting
6 years ago
4956ab5ea3
Fix compile
6 years ago
ac7ef0999d
WIP: Fix Twitter Cards
...
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
6 years ago
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
6 years ago
379d04692c
Filter summary in keywordpolicy
6 years ago
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
6 years ago
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
45e57dd187
rich media: tighten fetching timeouts and size limits
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
cc21fc5f53
refactor, status view updating, error handling
6 years ago
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
638456ce8f
elixir too new for CI's mix format lol
6 years ago
a0d732ec55
it works!!
6 years ago
6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
6 years ago
d924dc73ba
de-group import/s
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
6 years ago
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
381fe44172
HTML.Scrubber.Default: Consistency
6 years ago
2272934a5e
Stash
6 years ago
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
6 years ago
473095faf2
Web.Federator: Fix unused variable
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
8bcfac93a8
Make credo happy
6 years ago
563f04e81b
Do autofollow first.
6 years ago
bbd0049fae
Respect blocks in mass follow.
6 years ago
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
7e47a810a2
help i am not good with git
6 years ago
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
6 years ago
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
7356659273
wow
6 years ago
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
f88dec8b33
What idiot did that? (me)
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
2174f6eb4f
Add default config for keyword policy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
7e3ec93ed0
made a silly oopsie
6 years ago
77448de492
ugghhhh
6 years ago
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
6 years ago
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
6 years ago
a2bb5d890d
html: don't attempt to parse nil content
6 years ago
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
6 years ago
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
6 years ago
4031c94a59
fix hellthread threshold deprecation warning
6 years ago
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
93e136d70b
mix: add user tag/untag task
6 years ago
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
6 years ago
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
6 years ago
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
58262a8b8a
removed a debug thingy
6 years ago
4430641349
squished a bug
6 years ago
3cf046babb
actually commited the changes
6 years ago
63a4f4b7be
fixed Map,put arguments, updated nomenclature
6 years ago
583c4e0f17
more tweaks, fixed silly mistakes...
6 years ago
e10cda7541
implemented tweaks
6 years ago
c57f37bd36
Merge branch 'mogrify-orient' into 'develop'
...
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
6 years ago
531507a635
fixed things
6 years ago
10130fa7d6
made toggleable, added docs
6 years ago
0ef0ae35ab
added optional delist feature
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
505a084058
Still do caching in tests.
6 years ago
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
2c59eb3cfc
Add responsive features to layout
6 years ago
68d461b3a9
Check if rich media uri is relative
6 years ago
833404f0f5
Use with instead of if in the card
6 years ago
e4d18f328b
merge only if page_url is an absolute path
6 years ago
eugenijm