Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,276 Commits 1 Branch 0 Tags 222 MiB
35da3be9dd
Commit Graph

11276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder
079e410d6e Add a migration to clean up activity_expirations table 2020-08-04 14:58:42 -05:00
rinpatch
b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop' 
Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845
 2020-08-04 19:17:30 +00:00
rinpatch
fede37e4c6 Merge branch 'chore/consolidate-rich-media-http' into 'develop' 
Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827
 2020-08-04 19:16:38 +00:00
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022 2020-08-04 13:31:40 -05:00
lain
917aa090f0 Merge branch 'fix/activity-expiration-policy' into 'develop' 
Fix ActivityExpirationPolicy

Closes #2019

See merge request pleroma/pleroma!2847
 2020-08-04 16:30:09 +00:00
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy 2020-08-04 18:26:37 +04:00
lain
b55e26e816 Merge branch 'chore/credo-alias' into 'develop' 
Add a simple credo mix alias to run the same checks we use in CI

See merge request pleroma/pleroma!2846
 2020-08-04 14:09:23 +00:00
Mark Felder
697e3db01c Add analyze mix alias to run the same credo checks we use in CI 2020-08-04 08:55:40 -05:00
lain
878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
lain
532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-04 15:10:36 +02:00
lain
36aa34a1a8 MastodonAPITest: Do the needful 2020-08-04 15:08:51 +02:00
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank) 2020-08-04 14:29:16 +02:00
lain
1a00713744 CommonValidations: Treat deactivated users as not present. 2020-08-04 14:17:03 +02:00
lain
0cfadcf2ca TransmogrifierTest: Add test for deactivated users 2020-08-04 14:15:32 +02:00
Angelina Filippova
8bb5441547 Update descriptions in :frontends group 2020-08-04 15:10:44 +03:00
lain
e92c040ad3 CommonAPITest: Add test that deactivated users can't post. 2020-08-04 14:08:12 +02:00
lain
988ca4ab6a Test Config: Don't have any MRFs by default 2020-08-04 14:07:10 +02:00
lain
953f71bcfa App Test: Make more resilient 2020-08-04 13:38:30 +02:00
Roman Chvanikov
56e9bf3393 Unify Config.get behaviour for atom/list key param 2020-08-04 14:35:47 +03:00
lain
28584bb224 Merge branch 'email-blacklist' into 'develop' 
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
 2020-08-04 11:00:30 +00:00
lain
2f4289d455 Changelog: Add info about email blacklist 2020-08-04 12:49:56 +02:00
Alex Gleason
4f57e85ab9
Email blacklist: Update phrasing again 2020-08-03 22:20:49 -05:00
Alex Gleason
058daf498f
Email blacklist: Update response phrasing 2020-08-03 19:57:53 -05:00
Angelina Filippova
63b1ca6a07 Add label to :restrict_unauthenticated setting, fix typos 2020-08-04 02:21:25 +03:00
Angelina Filippova
ae95472dcc Update :welcome settings description 2020-08-04 02:04:29 +03:00
Angelina Filippova
1489c2ae5f Fix :args settings description in Upload.Filter.Mogrify group 2020-08-04 01:45:18 +03:00
lain
e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' 
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
 2020-08-03 21:01:56 +00:00
Ilja
cbf8bfc694 Improved WelcomeChatMessageTest 
* Checks if message is the same using ==/2 instead of =~/2
 2020-08-03 20:13:43 +02:00
Mark Felder
016d8d6c56 Consolidate construction of Rich Media Parser HTTP requests 2020-08-03 12:37:31 -05:00
Ilja
13e5540c2c Apply 1 suggestion(s) to 1 file(s) 2020-08-03 16:44:56 +00:00
lain
e26f2c9135 Changelog: Update with frontend mix task. 2020-08-03 18:23:26 +02:00
lain
8b1da33a54 Docs: Add info about installing from a local path. 2020-08-03 17:50:53 +02:00
lain
5c2745725e Docs: Document installation of frontends 
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
 2020-08-03 17:44:59 +02:00
lain
187d9bda0f Description: Add new fields for frontend configuration. 2020-08-03 16:39:01 +02:00
lain
56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop' 
Follower mrf again

See merge request pleroma/pleroma!2833
 2020-08-03 14:22:11 +00:00
lain
de3bdc63ad AccountControllerTest: Add test for message returned. 2020-08-03 15:00:14 +02:00
lain
66ebd88634 Merge branch 'config/default_ok_oldage' into 'develop' 
config: :mrf, :policies default to ObjectAgePolicy

Closes #2000

See merge request pleroma/pleroma!2814
 2020-08-03 12:50:29 +00:00
lain
5876d5123c Merge branch 'object-age-fix' into 'develop' 
MRF Object Age Policy: Don't break on messages without cc/to

See merge request pleroma/pleroma!2840
 2020-08-03 12:50:10 +00:00
lain
10c792110e MRF Object Age Policy: Don't break on messages without cc/to 2020-08-03 14:12:32 +02:00
lain
e45e07d2b5 Merge branch 'indigenous-client' into 'develop' 
Add indigenous to clients

See merge request pleroma/pleroma!2835
 2020-08-03 11:37:55 +00:00
lain
8fcbfd961d Merge branch 'reportnote-test' into 'develop' 
ReportNote test

Closes #2014

See merge request pleroma/pleroma!2839
 2020-08-03 09:55:56 +00:00
Alex Gleason
f9301044ed
Add ReportNote test 2020-08-02 17:45:15 -05:00
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory 2020-08-02 16:36:55 -05:00
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
Alex Gleason
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010 2020-08-02 13:42:23 -05:00
swentel
0012894d4e Add indigenous to clients 2020-08-02 19:33:22 +02:00
Ilja
f671d7e68c Add welcome chatmessages 
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
 2020-08-02 15:54:59 +02:00
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs 2020-08-01 16:08:29 -05:00
lain
70951d042b Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop' 
[#1985] Prevented force login on registration if account approval and/or email confirmation needed

Closes #1985

See merge request pleroma/pleroma!2823
 2020-08-01 15:58:17 +00:00
rinpatch
69b9c328c9 Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop' 
ConnectionPool: fix gun open errors being returned without an error tuple

Closes #2008

See merge request pleroma/pleroma!2832
 2020-08-01 15:17:41 +00:00