Commit Graph

5811 Commits (998437d4a4111055e019f28dd84a8af1f9a27047)

Author SHA1 Message Date
feld d7af0294e6 Merge branch 'service-worker-allowed-header' into 'develop'
4 years ago
Alexander Strizhakov 875fbaae35
support for expires_in/expires_at in filters
4 years ago
Haelwenn 250e202098 Merge branch 'fix/missing-own_votes' into 'develop'
4 years ago
Mark Felder 2cb5c16723 Credo
4 years ago
Mark Felder 0b19534475 Merge branch 'develop' into docs/apache-config
4 years ago
Ivan Tashkinov e7864a32d7 [#3213] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.
4 years ago
Ivan Tashkinov 694d98be55 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov 3f3d64acbf
little refactor and tests
4 years ago
Mark Felder 537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 6bfd497f4a Include own_votes in the poll data
4 years ago
Ivan Tashkinov 218c519606 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder 80ccdb56f6 Make tag urls absolute
4 years ago
Mark Felder e5b32aab92 rename function
4 years ago
Mark Felder 003402df40 Add ability to invalidate cache entries for Apache
4 years ago
eugenijm 7fcaa188a0 Allow to define custom HTTP headers per each frontend
4 years ago
eugenijm 133644dfa2 Ability to set the Service-Worker-Allowed header
4 years ago
Ivan Tashkinov c041e9c630 [#3213] HashtagsTableMigrator: failures handling fix, retry function.
4 years ago
Ivan Tashkinov 2634a16b4c Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov 6d48144a9d
use proper naming
4 years ago
feld 958a7f6ed0 Merge branch 'fix/reblog-api' into 'develop'
4 years ago
Mark Felder 28581e03ad Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
Egor Kislitsyn 1b79dce7bc
Fix Reblog API
4 years ago
Ivan Tashkinov 48b399cedb [#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
4 years ago
Mark Felder 2c0fe2ea9e Remove toggle_confirmation; require explicit state change
4 years ago
Mark Felder d36182c088 Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder ebd7d1365b Make setting user activation status explicit
4 years ago
Mark Felder 860b5c7804 Change user.deactivated field to user.is_active
4 years ago
Mark Felder f7e59c28ed Change user.approval_pending field to user.is_approved
4 years ago
Lain Soykaf 39f3683a06 Pbkdf2: Use it everywhere.
4 years ago
Ivan Tashkinov e350898828 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 3e4d84729a [#3213] Prototype of data migrations functionality / HashtagsTableMigrator.
4 years ago
lain 9106048c61 Password: Replace Pbkdf2 with Password.
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
feld 5453038ce9 Merge branch 'fix/backup-url-on-s3' into 'develop'
4 years ago
lain 7a1cb752dd Pagination: Don't be dos'd by random parameters.
4 years ago
Mark Felder ef59d99833 Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
4 years ago
Mark Felder 1040881047 Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
4 years ago
lain e1a547d7d3 ChatMessages: Fix pagination headers.
4 years ago
Mark Felder 9887cdf9be Formatting
4 years ago
feld fa63f1b55b Apply 4 suggestion(s) to 2 file(s)
4 years ago
Mark Felder 86dcfb4eb9 More places we should be using Upload.base_url
4 years ago
Mark Felder ad79983614 Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
4 years ago
lain 80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
4 years ago
Alex Gleason 3342f6a7ef
Backups: render ID in API
4 years ago
lain ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop'
4 years ago
lain cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop'
4 years ago
Alex Gleason 20af025c65
AdminAPI: return user email
4 years ago
Mark Felder d69c78ceb9 Remove configurability of upload proxy opts, simplify
4 years ago
Mark Felder 64116f63d9 URI.encode custom emojis
4 years ago
lain 20a269ed69 Merge branch 'fix/pagination-regression' into 'develop'
4 years ago
lain f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
lain bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
lain d44850d7a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
lain 8e5904daa5 SideEffects.DeleteTest: asyncify.
4 years ago
Mark Felder 83f27282ba Do not try to guess which pagination we need by the existence of an :offset param.
4 years ago
lain e1e7e4d379 Object: Rework how Object.normalize works
4 years ago
Alex Gleason 0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
feld afe9c152ab Merge branch 'fix/reports-ordering' into 'develop'
4 years ago
Alex Gleason 0d6b9ce8ca Apply 2 suggestion(s) to 1 file(s)
4 years ago
feld 2aa60e7592 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ivan Tashkinov 303055456f Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.
4 years ago
Alex Gleason 11d40e92b7
Render AKAs in Actor endpoints
4 years ago
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder 2597b028f7 Make pagination type conditional
4 years ago
Mark Felder 085d4e6cfc Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
4 years ago
Mark Felder 4c5f75f4e9 Support pagination in AdminAPI for user statuses
4 years ago
Mark Felder 744b34709d Do not reverse order of reports. We want newest ones sorted to the top.
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Ivan Tashkinov 14fae94c0e [#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
4 years ago
Alexander Strizhakov 2e859794ee
non condition dir creation
4 years ago
Alexander Strizhakov 7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
Alexander Strizhakov aafd7b44ce
check dir existence in policy
4 years ago
Ivan Tashkinov 4134abef63 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov cbb19d0e18 [#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
4 years ago
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Ivan Tashkinov ee221277b0 Encapsulation of tags / hashtags fetching from objects.
4 years ago
lain ab633e51ab Linting
4 years ago
lain 5db1e6c8d3 Pipeline test: Switch from Mock to Mox.
4 years ago
lain c9d73af74d Cachex: Unify arity of callback function
4 years ago
Kaizhe Huang fb02241580 Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
4 years ago
lain 95a9bdfc37 Tests: Use NullCache for async tests.
4 years ago
lain 713612c377 Cachex: Make caching provider switchable at runtime.
4 years ago
FiveYellowMice 83cd7f2b5f WebFinger: add subscribe_address in return data of JSON responses
4 years ago
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain 8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
4 years ago
lain 6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop'
4 years ago
Mark Felder 6dac2ac71a Minor refactoring of the logic for hiding followers/following counts.
4 years ago
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed
4 years ago
Ivan Tashkinov 7fff9c1bee Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
4 years ago
lain 477c6c8e55 Merge branch 'auth-improvements' into 'develop'
4 years ago
lain 1436a2fa2d Merge branch 'stream-follow-updates' into 'develop'
4 years ago
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov e9859b68fc [#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
4 years ago
feld 6adad96c79 Merge branch 'issue/2256' into 'develop'
4 years ago
Egor Kislitsyn c9afb350e7
Document follow relationship updates and cleanup
4 years ago