kaniini
24bcc209f9
Merge branch 'refactoring/fix_render_view' into 'develop'
...
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
5 years ago
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
rinpatch
e6f036b9ad
Merge branch 'issues/1016' into 'develop'
...
[#1016 ] add clear formatted text/ removes links with private ip
See merge request pleroma/pleroma!1335
5 years ago
Maksim Pechnikov
437fd6046d
update changelog
5 years ago
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
Maksim
f1817fe94b
Apply suggestion to CHANGELOG.md
5 years ago
Maksim Pechnikov
7d6a543eca
update changelog
5 years ago
Maksim Pechnikov
5c0f646cef
fix validate_page_url
5 years ago
Maksim
ec01b7c934
Apply suggestion to docs/config.md
5 years ago
Roman Chvanikov
a7a54068f9
Fix Controller.render/4 deprecation
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov
0cb8e710fb
add test
5 years ago
Maksim Pechnikov
0276cf5a02
fix validate_url for private ip
5 years ago
kaniini
d80859731e
Merge branch 'issues/184' into 'develop'
...
[#184 ] small refactoring reset password
See merge request pleroma/pleroma!1301
5 years ago
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
kaniini
1ab8a9e4fe
Merge branch 'feature/rework-user-deletion' into 'develop'
...
Rework user deletion
Closes #846
See merge request pleroma/pleroma!1308
5 years ago
Sergey Suprunenko
2c63c67512
Rework user deletion
5 years ago
kaniini
0f07bcc9e3
Merge branch 'conversation-update-on-dm-delete' into 'develop'
...
Broadcast conversation update when DM is deleted
Closes #1001
See merge request pleroma/pleroma!1311
5 years ago
Eugenij
f2c03425b0
Broadcast conversation update when DM is deleted
5 years ago
rinpatch
58d567ddc5
Merge branch 'modify-config.md-for-S3' into 'develop'
...
Modify config.md for s3
See merge request pleroma/pleroma!1331
5 years ago
aries
550302c041
Apply suggestion to docs/config.md
5 years ago
feld
826d0424c1
Merge branch 'update/adminfe' into 'develop'
...
Update adminFE to latest build
See merge request pleroma/pleroma!1333
5 years ago
Mark Felder
7b9e21e8a2
Update adminFE to latest build
5 years ago
aries
7daaaf84f1
Fix markdown mistakes
5 years ago
aries
4bac13966b
modify config.md for S3
5 years ago
kaniini
48174dc290
Merge branch 'bind-to-localhost' into 'develop'
...
Bind to 127.0.0.1 instead of 0.0.0.0 by default
See merge request pleroma/pleroma!1329
5 years ago
rinpatch
875100de01
Bind to 127.0.0.1 instead of 0.0.0.0 by default
5 years ago
kaniini
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
5 years ago
kaniini
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
Alex S
b37ede5df3
log capturing
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
Haelwenn
72f365df07
Merge branch 'docs/remove-tootdon' into 'develop'
...
docs/clients.md: Remove tootdon
See merge request pleroma/pleroma!1326
5 years ago
Haelwenn
066f4622d6
Merge branch 'feature/rum-config-generator' into 'develop'
...
Support RUM indexes in the config generator
See merge request pleroma/pleroma!1324
5 years ago
Haelwenn (lanodan) Monnier
ab79a18b77
docs/clients.md: Remove tootdon
...
Of course a proprietary client would send the messages home :D
5 years ago
Alex S
410add1c30
support for tuples with more than 2 values
5 years ago
lain
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
.
5 years ago
rinpatch
3ac5ecbac1
Support RUM indexes in the config generator
5 years ago
rinpatch
8dbcff2fed
Merge branch 'mix_sem_ver_version_fix' into 'develop'
...
Fixed mix version computed for underscore-containing branches
See merge request pleroma/pleroma!1314
5 years ago
rinpatch
53c73cd1a3
Merge branch 'fix/ecto-tasks-release' into 'develop'
...
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
5 years ago
rinpatch
4b791afd60
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'
...
notifications: fix notification generation for non-create activities
See merge request pleroma/pleroma!1323
5 years ago
William Pitcock
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
, an Object.normalize() call was introduced. calling Object.normalize()
on an activity with a non-object URI (say, a user) causes Really Bad Things to happen.
so don't do that.
5 years ago
Alex S
f0fccb7578
fix for int and modules
5 years ago
rinpatch
19f16e829d
Load the application before executing the create task
5 years ago
rinpatch
ebee9f59d8
Ecto tasks: Resolve relative path using the application directory
...
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
5 years ago
kaniini
ddd04d1c52
Merge branch 'chore/update-bbcode' into 'develop'
...
mix: update bbcode dependency to v0.1.1
See merge request pleroma/pleroma!1321
5 years ago
rinpatch
cf94b813e5
Merge branch 'fix/fallback-config' into 'develop'
...
Fallback to Config if Mix.Config does not exist, even if Config does not exist either
See merge request pleroma/pleroma!1320
5 years ago
William Pitcock
481932309f
mix: update bbcode dependency to v0.1.1
5 years ago
rinpatch
f4009b6706
Fallback to Config if Mix.Config does not exist, even if Config does not
...
exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
5 years ago
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
5 years ago