squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,826 Commits 154 Branches 42 Tags 503 MiB
7ab524b899
Commit Graph

12826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilja
7ab524b899 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies 2021-01-10 13:17:04 +01:00
rinpatch
be7a76abc0 Merge branch 'feat/format-optional-migrations' into 'develop' 
.formatter.exs: Format optional migrations

See merge request pleroma/pleroma!3249
 2021-01-10 08:40:13 +00:00
rinpatch
6b28121897 .formatter.exs: Format optional migrations 
(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)
 2021-01-10 11:28:41 +03:00
rinpatch
ad5338a79c Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop' 
Add some information about setting up a development environment

Closes #1904

See merge request pleroma/pleroma!3207
 2021-01-10 08:25:36 +00:00
Ilja
6284e8f4b2 Add development section 
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
 2021-01-10 08:25:36 +00:00
Ilja
95d5589df6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies 2021-01-09 17:28:58 +01:00
lain
5822338f3a Merge branch 'guppe-example' into 'develop' 
ActivtityPub Test: Add example for guppe actor

See merge request pleroma/pleroma!3243
 2021-01-08 15:55:48 +00:00
lain
7173d35ef8 Merge branch 'confirm-users' into 'develop' 
Automatically confirm logged-in users

See merge request pleroma/pleroma!3234
 2021-01-08 15:36:42 +00:00
Alex Gleason
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users 2021-01-08 07:48:19 -06:00
Alex Gleason
1b98cd8610
Remove ConfirmUserPlug 2021-01-08 07:47:55 -06:00
lain
80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop' 
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
 2021-01-08 13:10:49 +00:00
lain
7e43abce68 Merge branch 'backup-ids' into 'develop' 
Backups: render ID in API

See merge request pleroma/pleroma!3245
 2021-01-07 19:16:58 +00:00
Alex Gleason
3342f6a7ef
Backups: render ID in API 2021-01-07 13:06:22 -06:00
lain
ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop' 
Cleanup Pleroma.Upload proxy opts

See merge request pleroma/pleroma!3236
 2021-01-07 16:25:39 +00:00
lain
bd788c0939 ActivtityPub Test: Add example for guppe actor 2021-01-07 16:20:30 +01:00
lain
cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop' 
Object: Rework how Object.normalize works

See merge request pleroma/pleroma!3229
 2021-01-07 11:09:18 +00:00
lain
4d56aca904 Merge branch 'adminapi-user-email' into 'develop' 
AdminAPI: return user email

See merge request pleroma/pleroma!3240
 2021-01-07 10:08:02 +00:00
lain
f1ca2ac64b Merge branch 'upstream/remote-emoji-support' into 'develop' 
Upstream external emoji support

See merge request pleroma/pleroma!3238
 2021-01-07 10:06:39 +00:00
Alex Gleason
7b8dbaff31
Call ConfirmUserPlug from Router, not Endpoint 2021-01-06 15:16:44 -06:00
Alex Gleason
9f6fa5877f
Add AdminAPI.AccountViewTest 2021-01-06 11:43:07 -06:00
Alex Gleason
20af025c65
AdminAPI: return user email 2021-01-06 11:30:32 -06:00
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
Mark Felder
d69c78ceb9 Remove configurability of upload proxy opts, simplify 2021-01-05 15:06:00 -06: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
fee0c6a2cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users 2021-01-05 13:33:57 +01: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
lain
d44850d7a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor 2021-01-05 10:48:32 +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
lain
e1e7e4d379 Object: Rework how Object.normalize works 
Now it defaults to not fetching, and the option is named.
 2021-01-04 13:38:31 +01:00
Alex Gleason
0ec7e9b8e9
AdminAPI: return id for moderation log entries 2021-01-01 11:59:48 -06:00
Alex Gleason
7b44605cb8
Migration to confirm previously-logged-in users 2020-12-31 14:04:51 -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
Alex Gleason
64f0e96ff6
Automatically confirm logged-in users 2020-12-31 12:13:08 -06:00