nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
12727 commits 2 branches 0 tags 272 MiB
Commit graph

12727 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
feld 70e8ef2c46 Merge branch 'fix/adminapi-user-status-pagination' into 'develop' 
Support pagination in AdminAPI for user statuses

See merge request pleroma/pleroma!3226
 2020-12-31 16:04:42 +00:00
feld 2aa60e7592 Apply 1 suggestion(s) to 1 file(s) 2020-12-31 09:58:43 -06:00
Mark Felder 2597b028f7 Make pagination type conditional 2020-12-30 16:37:04 -06:00
Mark Felder 085d4e6cfc Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset 2020-12-30 16:10:10 -06:00
Mark Felder 4c5f75f4e9 Support pagination in AdminAPI for user statuses 2020-12-30 15:18:54 -06:00
lain 38924166eb Merge branch 'deps/crypt-local-fork' into 'develop' 
Switch to local fork of crypt until upstream fixes ability to build on aarch64

See merge request pleroma/pleroma!3224
 2020-12-30 14:04:10 +00:00
Mark Felder a1a58f0a53 Switch to local fork of crypt until upstream fixes ability to build on aarch64 
https://github.com/msantos/crypt/pull/8
 2020-12-28 17:52:18 -06:00
Haelwenn 607cac1947 Merge branch 'revert-b122b6ff' into 'develop' 
Revert "Merge branch 'features/hashtag-column' into 'develop'"

See merge request pleroma/pleroma!3222
 2020-12-28 12:12:19 +00:00
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'" 
This reverts merge request !2824
 2020-12-28 12:02:16 +00:00
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop' 
Insert text representation of hashtags into object["hashtags"]

See merge request pleroma/pleroma!2824
 2020-12-28 10:14:58 +00:00
Haelwenn (lanodan) Monnier d0c2479710
pleroma.database fill_old_hashtags: Add month_limit argument 2020-12-28 11:05:25 +01:00
Haelwenn (lanodan) Monnier 18b536c176
Pleroma.Object/1: take %Object{} as argument instead 2020-12-28 11:05:24 +01:00
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop' 
Test framework overhaul (speed, reliability)

See merge request pleroma/pleroma!3209
 2020-12-26 10:26:35 +00:00
Mark Felder fecefe68f8 Add test/instance to .gitignore 2020-12-23 14:09:22 -06:00
lain 88530c02d6 Merge branch 'update/linkify' into 'develop' 
Update Linkify to 0.4.1

See merge request pleroma/pleroma!3217
 2020-12-23 15:58:20 +00:00
Mark Felder 5b838accc0 Update Linkify to 0.4.1 
Fixes false positive detection of IPv4 addresses
 2020-12-23 09:07:01 -06:00
lain ce1be8f5e6 Merge branch 'mergeback/2.2.1' into 'develop' 
Mergeback/2.2.1

See merge request pleroma/pleroma!3215
 2020-12-23 14:08:08 +00:00
lain ae934659d1 Align changelog 2020-12-23 14:56:57 +01:00
lain 31c89acd00 Merge branch 'stable' into mergeback/2.2.1 2020-12-23 14:41:04 +01:00
lain f64237927c Merge branch 'release/2.2.1' into 'stable' 
Release/2.2.1

See merge request pleroma/pleroma!3214
 2020-12-23 13:35:41 +00:00
lain 843d2074fe Fixtures: Add application actor fixture. 2020-12-23 11:56:08 +01:00
lain 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1 2020-12-23 11:40:34 +01:00
lain 322463e1bd Update changelog 2020-12-23 11:39:19 +01:00
lain 463eec992a Apply 1 suggestion(s) to 1 file(s) 2020-12-23 10:35:41 +00:00
lain 68eed0873e Linting 2020-12-23 11:16:13 +01:00
lain d4e6ca88a6 Update frontend 2020-12-23 09:35:19 +01:00
lain b988e9cc8b Mix: Update version. 2020-12-22 22:11:02 +01:00
lain a8ca282b4a Update changelog 2020-12-22 21:54:31 +01:00
lain d788b41c2e Report fixes. 2020-12-22 21:32:11 +01:00
lain 0f527c9e02 Mix: Update linkify to 0.4.1 2020-12-22 21:22:48 +01:00
Ivan Tashkinov 5cfa32cb50 [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results. 2020-12-22 21:16:37 +01:00
Alexander Strizhakov 897b62091b fix for elixir 1.11 
load runtime configs in releases with config provider
 2020-12-22 21:08:44 +01:00
lain c26583c99e SideEffects: fix test 2020-12-22 21:08:11 +01:00
lain 41d6225e2e User: Remove left-over (wrong) fix. 2020-12-22 21:08:04 +01:00
lain a32e13e6c4 User: Don't allow local users in remote changesets 2020-12-22 21:07:56 +01:00
Mark Felder c10783087f Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-22 21:06:36 +01:00
lain 66c75b0192 Update changelog 2020-12-22 21:05:12 +01:00
lain 29c3c35ba1 Search: Only skip ordering the rum index. 2020-12-22 21:03:19 +01:00
lain 3388bf9c9b Activity search: Fix order of results 
Greatly speeds up the search for RUM.
 2020-12-22 21:03:01 +01:00
Mark Felder 42a386eb9f Document fixing the pleroma.user delete_activities mix task 2020-12-22 20:51:24 +01:00
Mark Felder a21aeeee12 Need to start web_resp cache or mix task fails 2020-12-22 20:49:16 +01:00
Mark Felder 93852f1b42 Document S3 and Elixir 1.11 compat fix 2020-12-22 20:48:56 +01:00
Mark Felder 012108a299 Fix S3 uploads with Elixir 1.11 2020-12-22 20:48:49 +01:00
Haelwenn (lanodan) Monnier aa848cbd75 pleroma.instance: Fix Exiftool module name 2020-12-22 20:48:19 +01:00
Alexander Strizhakov 065009a57a remove PurgeExpiredActivity from Oban db config 2020-12-22 20:47:20 +01:00
feld c5cce89f50 Merge branch 'update-elixir-make' into 'develop' 
Update for retired elixir_make package version

See merge request pleroma/pleroma!3211
 2020-12-22 14:53:04 +00:00
Alexander Strizhakov dedc575225
update for retired elixir_make package version 2020-12-22 17:42:23 +03:00
rinpatch 0ca13be499 Merge branch 'update/instance-gen-template' into 'develop' 
Update instance.gen template

See merge request pleroma/pleroma!3210
 2020-12-22 11:31:06 +00:00
Haelwenn (lanodan) Monnier 87b13c5430
Create Object.hashtags/1 wrapper 2020-12-22 05:15:34 +01:00
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"] 
Includes a new mix task: pleroma.database fill_old_hashtags
 2020-12-22 05:15:34 +01:00