lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
4 years ago
rinpatch
f06444a289
Merge branch 'invisible-index' into 'develop'
...
Migrations: Add an index on the `invisible` field on users.
See merge request pleroma/pleroma!2895
4 years ago
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
4 years ago
lain
5ea752dab2
Migrations: Add an index on the `invisible` field on users.
4 years ago
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
4 years ago
Hugo
b2d3b26511
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Hugo Müller-Downing
317b6c6c52
Start :ssl if not started when running migration or rollback
4 years ago
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
4 years ago
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
rinpatch
ec242b4706
Merge branch 'fix/docs-tabs' into 'develop'
...
Docs: Fix the way tabs are declared
Closes #2045
See merge request pleroma/pleroma!2892
4 years ago
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
4 years ago
feld
57a00e22c4
Merge branch 'update/admin-fe-20200814' into 'develop'
...
Update AdminFE bundle for 2.1.0 release
See merge request pleroma/pleroma!2889
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
Mark Felder
f510dc30b4
Update AdminFE bundle for 2.1.0 release
4 years ago
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
4 years ago
lain
76ce3a1c9e
Mogrifun: Add a line about the purpose of the module.
4 years ago
feld
014f91c1c3
Merge branch 'issue/2036-part-2' into 'develop'
...
[#2036 ] fixed cron worker
See merge request pleroma/pleroma!2886
4 years ago
Maksim Pechnikov
9b055f7211
fix cron wroker
4 years ago
Maksim Pechnikov
3515cb5c3a
fix Cron.PurgeExpiredActivitiesWorker
4 years ago
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
4 years ago
Haelwenn
fbc220d09c
Merge branch 'nitfix/side-effects-typo' into 'develop'
...
side_effects: Fix typo on notification
See merge request pleroma/pleroma!2885
4 years ago
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
4 years ago
Haelwenn
f99b8a25eb
Merge branch 'reject' into 'develop'
...
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
4 years ago
lain
8d5f9d4b28
Merge branch 'ci-fix-2' into 'develop'
...
CI: Add cmake to build
See merge request pleroma/pleroma!2884
4 years ago
lain
035c44dd7b
CI: Add cmake to build
4 years ago
lain
06e435c959
Merge branch 'update-frontend-2020-08-13' into 'develop'
...
Update frontend
See merge request pleroma/pleroma!2883
4 years ago
lain
5bcf15d553
Update frontend
4 years ago
lain
88ec5c2de5
Merge branch 'cmake' into 'develop'
...
Build files: Add cmake
See merge request pleroma/pleroma!2882
4 years ago
lain
a47406d577
Build files: Add cmake
4 years ago
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
4 years ago
lain
aaf7bd89a7
Migrations: Fix Logger requirements.
4 years ago
lain
5be25b3e38
Merge branch '1152-deletion' into 'develop'
...
User deletion issue exploration
See merge request pleroma/pleroma!2879
4 years ago
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
4 years ago
Alexander Strizhakov
29a7bcd5bb
reverting pinned posts in filtering
4 years ago
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
4 years ago
feld
a94210c70b
Merge branch 'docs_improve_static_dir_documentation' into 'develop'
...
Improve static_dir documentation
See merge request pleroma/pleroma!2864
4 years ago
feld
3aa7969ff9
Update robots_txt.md
4 years ago
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
4 years ago
Mark Felder
b89fc1f227
Add warning to the migration
4 years ago
Mark Felder
091da10832
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
4 years ago
Mark Felder
98058bd06e
Merge branch 'develop' into fix/activity-expirations-again
4 years ago
lain
05ff666f99
AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
lain
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
4 years ago
Alexander Strizhakov
eec1ba232c
don't expire pinned posts
4 years ago
lain
62f7cca9a1
Transmogrifier Tests: Extract rejections.
4 years ago
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
Alexander Strizhakov
57b455de5a
leave expirations with Create and Note types
4 years ago
Maksim Pechnikov
644effc63b
update docs
4 years ago
rinpatch
86c18e4165
Merge branch 'issue/2036-job-monitor' into 'develop'
...
[#2036 ] fix job monitor
See merge request pleroma/pleroma!2877
4 years ago