sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11165 commits 2 branches 40 tags 290 MiB
Commit graph

11165 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
34b099fffa Merge branch 'issue/1936' into 'develop' 
[#1936] Ability to search for banned MediaProxy URLs 

See merge request pleroma/pleroma!2873
 2020-08-17 13:05:20 +00:00
rinpatch
f06444a289 Merge branch 'invisible-index' into 'develop' 
Migrations: Add an index on the `invisible` field on users.

See merge request pleroma/pleroma!2895
 2020-08-17 12:38:14 +00:00
lain
e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop' 
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy

Closes #2046

See merge request pleroma/pleroma!2890
 2020-08-17 12:26:53 +00:00
lain
5ea752dab2 Migrations: Add an index on the invisible field on users. 2020-08-17 14:11:36 +02:00
rinpatch
1f2aad6fda Merge branch 'fix/start-ssl-if-ssl-required' into 'develop' 
Start :ssl if not started when running migration or rollback

Closes #2056

See merge request pleroma/pleroma!2894
 2020-08-17 08:44:26 +00:00
Hugo
b2d3b26511 Apply 1 suggestion(s) to 1 file(s) 2020-08-17 07:58:24 +00:00
Hugo Müller-Downing
317b6c6c52 Start :ssl if not started when running migration or rollback 2020-08-17 17:34:03 +10:00
Maksim Pechnikov
f6da12f45d fix search media proxy urls 2020-08-16 06:54:48 +03:00
Ivan Tashkinov
60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog. 2020-08-15 18:30:20 +03:00
rinpatch
ec242b4706 Merge branch 'fix/docs-tabs' into 'develop' 
Docs: Fix the way tabs are declared

Closes #2045

See merge request pleroma/pleroma!2892
 2020-08-15 07:42:10 +00:00
rinpatch
4fcf272717 Docs: Fix the way tabs are declared 
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.

Closes #2045
 2020-08-15 09:55:59 +03:00
feld
57a00e22c4 Merge branch 'update/admin-fe-20200814' into 'develop' 
Update AdminFE bundle for 2.1.0 release

See merge request pleroma/pleroma!2889
 2020-08-14 18:26:23 +00:00
Ivan Tashkinov
95529ab709 [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default). 2020-08-14 20:55:45 +03:00
Mark Felder
f510dc30b4 Update AdminFE bundle for 2.1.0 release 2020-08-14 12:48:49 -05:00
lain
33e508d7c6 Merge branch '1806-mogrifun' into 'develop' 
Mogrifun: Add a line about the purpose of the module.

Closes #1806

See merge request pleroma/pleroma!2888
 2020-08-14 17:15:59 +00:00
lain
76ce3a1c9e Mogrifun: Add a line about the purpose of the module. 2020-08-14 18:27:18 +02:00
feld
014f91c1c3 Merge branch 'issue/2036-part-2' into 'develop' 
[#2036] fixed cron worker

See merge request pleroma/pleroma!2886
 2020-08-13 21:35:40 +00:00
Maksim Pechnikov
9b055f7211 fix cron wroker 2020-08-13 21:03:15 +03:00
Maksim Pechnikov
3515cb5c3a fix Cron.PurgeExpiredActivitiesWorker 2020-08-13 21:01:21 +03:00
feld
14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop' 
Fix activity expirations again

See merge request pleroma/pleroma!2866
 2020-08-13 17:38:19 +00:00
Haelwenn
fbc220d09c Merge branch 'nitfix/side-effects-typo' into 'develop' 
side_effects: Fix typo on notification

See merge request pleroma/pleroma!2885
 2020-08-13 16:11:06 +00:00
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification 2020-08-13 18:10:43 +02:00
Haelwenn
f99b8a25eb Merge branch 'reject' into 'develop' 
Move Accepts and Rejects to the Pipeline

See merge request pleroma/pleroma!2878
 2020-08-13 16:04:43 +00:00
lain
8d5f9d4b28 Merge branch 'ci-fix-2' into 'develop' 
CI: Add cmake to build

See merge request pleroma/pleroma!2884
 2020-08-13 14:40:31 +00:00
lain
035c44dd7b CI: Add cmake to build 2020-08-13 16:38:04 +02:00
lain
06e435c959 Merge branch 'update-frontend-2020-08-13' into 'develop' 
Update frontend

See merge request pleroma/pleroma!2883
 2020-08-13 14:07:01 +00:00
lain
5bcf15d553 Update frontend 2020-08-13 16:04:34 +02:00
lain
88ec5c2de5 Merge branch 'cmake' into 'develop' 
Build files: Add cmake

See merge request pleroma/pleroma!2882
 2020-08-13 12:28:10 +00:00
lain
a47406d577 Build files: Add cmake 2020-08-13 14:12:45 +02:00
lain
2bc2b321b6 Merge branch 'fix/users_ap_id_not_null' into 'develop' 
Ensure ap_id column in users table cannot be null

See merge request pleroma/pleroma!2875
 2020-08-13 11:01:03 +00:00
lain
aaf7bd89a7 Migrations: Fix Logger requirements. 2020-08-13 12:32:05 +02:00
lain
5be25b3e38 Merge branch '1152-deletion' into 'develop' 
User deletion issue exploration

See merge request pleroma/pleroma!2879
 2020-08-13 09:06:33 +00:00
Maksim Pechnikov
56470647de Merge branch 'develop' into issue/1936 2020-08-13 09:00:25 +03:00
Alexander Strizhakov
29a7bcd5bb
reverting pinned posts in filtering 2020-08-12 20:01:21 +03:00
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations 2020-08-12 19:46:47 +03:00
feld
a94210c70b Merge branch 'docs_improve_static_dir_documentation' into 'develop' 
Improve static_dir documentation

See merge request pleroma/pleroma!2864
 2020-08-12 16:39:19 +00:00
feld
3aa7969ff9 Update robots_txt.md 2020-08-12 16:19:34 +00:00
feld
dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop' 
Update :welcome settings in description.exs

Closes #2024

See merge request pleroma/pleroma!2843
 2020-08-12 16:18:40 +00:00
Mark Felder
b89fc1f227 Add warning to the migration 2020-08-12 11:13:24 -05:00
Mark Felder
091da10832 Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria. 2020-08-12 11:00:01 -05:00
Mark Felder
98058bd06e Merge branch 'develop' into fix/activity-expirations-again 2020-08-12 09:42:28 -05:00
lain
05ff666f99 AdminApiControllerTest: Add test that deleted users get deactivated. 2020-08-12 16:31:00 +02:00
lain
2e347e8286 ActivityPub: Remove reject, move everything to the Pipeline. 2020-08-12 15:07:46 +02:00
lain
7224bf309e Transmogrifier: Move Rejects to the Pipeline 2020-08-12 14:48:51 +02:00
Alexander Strizhakov
eec1ba232c
don't expire pinned posts 2020-08-12 15:15:17 +03:00
lain
62f7cca9a1 Transmogrifier Tests: Extract rejections. 2020-08-12 13:39:54 +02:00
lain
bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject 2020-08-12 12:53:04 +02:00
Alexander Strizhakov
57b455de5a
leave expirations with Create and Note types 2020-08-12 12:41:47 +03:00
Maksim Pechnikov
644effc63b update docs 2020-08-12 08:51:09 +03:00
rinpatch
86c18e4165 Merge branch 'issue/2036-job-monitor' into 'develop' 
[#2036] fix job monitor

See merge request pleroma/pleroma!2877
 2020-08-12 03:30:01 +00:00