Commit Graph

12956 Commits (9948ff3356f9e9e214584207a53eba614c73383c)
 

Author SHA1 Message Date
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
lain 38924166eb Merge branch 'deps/crypt-local-fork' into 'develop'
4 years ago
Ivan Tashkinov 8d1a0c1afd [#3213] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.
4 years ago
Ivan Tashkinov e0b5edb6d5 [#3213] Fixed Object.object_data_hashtags/1 to process only AS2 elements of `data.tag` (basing on #2984).
4 years ago
Ivan Tashkinov a25c1e8ec0 [#3213] Improved `database.transfer_hashtags` mix task: proper rollback, speedup.
4 years ago
Mark Felder a1a58f0a53 Switch to local fork of crypt until upstream fixes ability to build on aarch64
4 years ago
Haelwenn 607cac1947 Merge branch 'revert-b122b6ff' into 'develop'
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 d0c2479710
pleroma.database fill_old_hashtags: Add month_limit argument
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 546da68a11
changelog entry
4 years ago
Alexander Strizhakov dad76703aa
not needed
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
Mark Felder e02889edb2
Add MRFs to the list of things that may need a soft reboot
4 years ago
Mark Felder 72aeb2e73b
Mark private
4 years ago
Mark Felder 77e39e6aae
Create dir for EmojiStealPolicy automatically
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
Mark Felder 50e226bc52 Revert, this is useful in an edge case
4 years ago
Mark Felder ce78b64db8 Formatting
4 years ago
Mark Felder 5a084d6f8d Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE
4 years ago
Mark Felder 7aec234b44 Remove Proxy settings that were not meant to exist under Pleroma.Upload
4 years ago
Mark Felder fecefe68f8 Add test/instance to .gitignore
4 years ago
lain 88530c02d6 Merge branch 'update/linkify' into 'develop'
4 years ago
Mark Felder 5b838accc0 Update Linkify to 0.4.1
4 years ago
lain ce1be8f5e6 Merge branch 'mergeback/2.2.1' into 'develop'
4 years ago
lain ae934659d1 Align changelog
4 years ago
lain 31c89acd00 Merge branch 'stable' into mergeback/2.2.1
4 years ago
lain f64237927c Merge branch 'release/2.2.1' into 'stable'
4 years ago
lain 843d2074fe Fixtures: Add application actor fixture.
4 years ago
lain 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
4 years ago
lain 322463e1bd Update changelog
4 years ago
lain 463eec992a Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain 68eed0873e Linting
4 years ago
lain d4e6ca88a6 Update frontend
4 years ago
lain b988e9cc8b Mix: Update version.
4 years ago
lain a8ca282b4a Update changelog
4 years ago
lain d788b41c2e Report fixes.
4 years ago
lain 0f527c9e02 Mix: Update linkify to 0.4.1
4 years ago
Ivan Tashkinov 5cfa32cb50 [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
4 years ago
Alexander Strizhakov 897b62091b fix for elixir 1.11
4 years ago