alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,691 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

12691 Commits

Author SHA1 Message Date
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
Mark Felder d5746e8447 Do not include pool_size in the template. It encourages unwanted fiddling :) 2020-12-21 15:19:24 -06:00
lain 8e1f32e715 Merge branch 'develop' into 'develop' 
WebFinger: add subscribe_address in return data of JSON responses

See merge request pleroma/pleroma!3206
 2020-12-21 17:13:52 +00:00
Kaizhe Huang fb02241580 Fix trailing whitespaces in lib/pleroma/web/web_finger.ex 2020-12-21 00:54:15 +11:00
lain 19be32a74e Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop' 
config/description.exs: Remove outdated information about Oban

See merge request pleroma/pleroma!3208
 2020-12-20 13:40:08 +00:00
rinpatch d501e55ec7 Merge branch 'bugfix/mastofe-install-script' into 'develop' 
download-mastofe-build.sh: Proper exit when artifact is missing

Closes #2329

See merge request pleroma/pleroma!3191
 2020-12-20 09:59:53 +00:00
Kaizhe Huang 509f82e4d6 Add test for subscribe_address in JSON WebFinger response 2020-12-19 22:11:47 +11:00
rinpatch a05e1d4e48 config/description.exs: Remove outdated information about Oban 
The version of Oban we depend on no longer uses ShareLocks, so this
note no longer applies.
 2020-12-19 11:27:42 +03:00
FiveYellowMice 83cd7f2b5f WebFinger: add subscribe_address in return data of JSON responses 2020-12-18 13:48:38 +00:00
rinpatch afc68a052c Merge branch 'long-life-oauth-tokens' into 'develop' 
[#2353] Virtually never-expiring OAuth tokens (new and already issued ones)

Closes #2353

See merge request pleroma/pleroma!3205
 2020-12-17 18:34:49 +00:00
Ivan Tashkinov 62bf4a1292 [#2353] Virtually never-expiring OAuth tokens (new and already issued ones). 2020-12-17 20:49:00 +03:00
feld ff7f7416f7 Merge branch 'registration-workflow' into 'develop' 
Improve registration workflow, fixes #2175

Closes #2235 and #2175

See merge request pleroma/pleroma!3068
 2020-12-17 16:00:30 +00:00
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-12-17 09:05:36 -06:00
lain 8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' 
Fix mastoapi ws posts dropping

Closes #2336

See merge request pleroma/pleroma!3198
 2020-12-16 11:35:45 +00:00
Haelwenn (lanodan) Monnier 5c75bfc586
download-mastofe-build.sh: Proper exit when artifact is missing 2020-12-15 16:31:23 +01:00
lain 6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop' 
[#2255] added error messages for posix error code

See merge request pleroma/pleroma!3138
 2020-12-15 15:16:03 +00:00
lain 0d285cf44f Merge branch 'fix/config-gen-detect-exiftool' into 'develop' 
instance.gen: Warn that stripping exif requires exiftool

Closes #2343

See merge request pleroma/pleroma!3197
 2020-12-15 14:39:15 +00:00
lain 09f6056b16 Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!3201
 2020-12-15 14:04:10 +00:00
shironeko 2d29fd7c8f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 87.7% (93 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
 2020-12-15 11:33:10 +00:00
lain b8c3dfc78c Merge branch 'chore/refactor-hide-counts' into 'develop' 
Minor refactoring of the logic for hiding followers/following counts.

See merge request pleroma/pleroma!3202
 2020-12-15 11:32:49 +00:00