Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,766 Commits 1 Branch 0 Tags 222 MiB
48cd336a72
Commit Graph

12766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Braun
48cd336a72 allow external emoji 2021-01-06 10:13:01 -06:00
feld
5e128a6be3 Merge branch 'fix/mediaproxy-config-descriptions' into 'develop' 
Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219
 2021-01-05 21:16:33 +00:00
lain
18296c7473 Merge branch 'fix/emoji-encoding' into 'develop' 
URI.encode custom emojis

Closes #2381

See merge request pleroma/pleroma!3235
 2021-01-05 20:09:29 +00:00
Mark Felder
f9090e00e6 Add test to validate URLs to custom emojis are properly encoded 2021-01-05 13:58:49 -06:00
Mark Felder
8864ac65c6 Add dinosaur gif from https://gifs.cc 
"Our animations are free to be used to enhance your website."
 2021-01-05 13:25:14 -06:00
Mark Felder
64116f63d9 URI.encode custom emojis 2021-01-05 12:29:51 -06:00
lain
20a269ed69 Merge branch 'fix/pagination-regression' into 'develop' 
Do not try to guess which pagination we need by the existence of an :offset param.

Closes #2399

See merge request pleroma/pleroma!3230
 2021-01-05 12:40:45 +00:00
lain
7a03b112f2 Merge branch '1526-account-aliases' into 'develop' 
Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233
 2021-01-05 12:31:33 +00:00
lain
e802b48d55 User: Use ObjectID type to validate also-known-as field 2021-01-05 13:10:14 +01:00
lain
f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases 2021-01-05 12:42:30 +01:00
lain
ca7cf62d2a Merge branch 'pleroma-moderation-log-stuff' into 'develop' 
AdminAPI: return id for moderation log entries

See merge request pleroma/pleroma!3232
 2021-01-05 11:36:57 +00:00
lain
bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff 2021-01-05 12:19:39 +01:00
lain
95a0ae8a35 AccountControllerTest: Fix test logic 2021-01-05 11:48:40 +01:00
Haelwenn
b3c36d3f7a Merge branch '2391-async-bugs' into 'develop' 
SideEffects.DeleteTest: asyncify.

Closes #2391

See merge request pleroma/pleroma!3231
 2021-01-05 00:01:44 +00:00
lain
8e5904daa5 SideEffects.DeleteTest: asyncify. 
Replace Mock with Mox, mock out Logger.
 2021-01-04 18:40:59 +01:00
Mark Felder
0e93775ed0 Add test to validate profile pagination works with keyset 2021-01-04 11:04:58 -06:00
Mark Felder
83f27282ba Do not try to guess which pagination we need by the existence of an :offset param. 
Require explicit request to get offset pagination.
 2021-01-04 10:13:17 -06:00
Alex Gleason
0ec7e9b8e9
AdminAPI: return id for moderation log entries 2021-01-01 11:59:48 -06:00
feld
afe9c152ab Merge branch 'fix/reports-ordering' into 'develop' 
Do not reverse order of reports. We want newest ones sorted to the top.

Closes #2364

See merge request pleroma/pleroma!3225
 2020-12-31 19:24:49 +00:00
Mark Felder
83d97ab98e Document reports ordering change 2020-12-31 13:15:44 -06:00
Alex Gleason
4200a06340
Aliases: refactor validate_also_known_as/1 2020-12-31 12:53:28 -06:00
Alex Gleason
0d6b9ce8ca Apply 2 suggestion(s) to 1 file(s) 2020-12-31 18:51:57 +00:00
Mark Felder
e4791258d4 Ensure newest report is returned first in the list 2020-12-31 12:40:42 -06:00
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
Alex Gleason
11d40e92b7
Render AKAs in Actor endpoints 2020-12-30 18:53:27 -06:00
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases 2020-12-30 17:10:02 -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
Mark Felder
744b34709d Do not reverse order of reports. We want newest ones sorted to the top. 2020-12-30 14:22:48 -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
50e226bc52 Revert, this is useful in an edge case 2020-12-23 17:41:15 -06:00
Mark Felder
ce78b64db8 Formatting 2020-12-23 17:41:10 -06:00
Mark Felder
5a084d6f8d Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE 2020-12-23 17:38:33 -06:00
Mark Felder
7aec234b44 Remove Proxy settings that were not meant to exist under Pleroma.Upload 2020-12-23 17:01:11 -06: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