aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-26Merge branch 'refactoring/fix_render_view' into 'develop'kaniini
Fix Controller.render/4 deprecation See merge request pleroma/pleroma!1337
2019-06-26Merge branch 'feature/configurable-pack-extensions' into 'develop'kaniini
Make default pack extensions configurable and default to png and gif See merge request pleroma/pleroma!1338
2019-06-26Merge branch 'issues/1016' into 'develop'rinpatch
[#1016] add clear formatted text/ removes links with private ip See merge request pleroma/pleroma!1335
2019-06-26update changelogMaksim Pechnikov
2019-06-26Make default pack extensions configurable and default to png and gifrinpatch
2019-06-26Apply suggestion to CHANGELOG.mdMaksim
2019-06-26update changelogMaksim Pechnikov
2019-06-26fix validate_page_urlMaksim Pechnikov
2019-06-26Apply suggestion to docs/config.mdMaksim
2019-06-26Fix Controller.render/4 deprecationRoman Chvanikov
2019-06-25add ignore hosts and TLDs for rich_mediaMaksim Pechnikov
2019-06-25add testMaksim Pechnikov
2019-06-25fix validate_url for private ipMaksim Pechnikov
2019-06-24Merge branch 'issues/184' into 'develop'kaniini
[#184] small refactoring reset password See merge request pleroma/pleroma!1301
2019-06-24[#184] small refactoring reset passwordMaksim
2019-06-24Merge branch 'feature/rework-user-deletion' into 'develop'kaniini
Rework user deletion Closes #846 See merge request pleroma/pleroma!1308
2019-06-24Rework user deletionSergey Suprunenko
2019-06-24Merge branch 'conversation-update-on-dm-delete' into 'develop'kaniini
Broadcast conversation update when DM is deleted Closes #1001 See merge request pleroma/pleroma!1311
2019-06-24Broadcast conversation update when DM is deletedEugenij
2019-06-24Merge branch 'modify-config.md-for-S3' into 'develop'rinpatch
Modify config.md for s3 See merge request pleroma/pleroma!1331
2019-06-24Apply suggestion to docs/config.mdaries
2019-06-23Merge branch 'update/adminfe' into 'develop'feld
Update adminFE to latest build See merge request pleroma/pleroma!1333
2019-06-23Update adminFE to latest buildMark Felder
2019-06-24Fix markdown mistakesaries
2019-06-24modify config.md for S3aries
2019-06-23Merge branch 'bind-to-localhost' into 'develop'kaniini
Bind to 127.0.0.1 instead of 0.0.0.0 by default See merge request pleroma/pleroma!1329
2019-06-23Bind to 127.0.0.1 instead of 0.0.0.0 by defaultrinpatch
2019-06-23Merge branch 'rich_media_titles_two' into 'develop'kaniini
Rich media titles two See merge request pleroma/pleroma!1325
2019-06-23Merge branch 'admin-config' into 'develop'kaniini
Admin config See merge request pleroma/pleroma!1328
2019-06-23log capturingAlex S
2019-06-23support for config groupsAlex S
2019-06-22Merge branch 'docs/remove-tootdon' into 'develop'Haelwenn
docs/clients.md: Remove tootdon See merge request pleroma/pleroma!1326
2019-06-22Merge branch 'feature/rum-config-generator' into 'develop'Haelwenn
Support RUM indexes in the config generator See merge request pleroma/pleroma!1324
2019-06-22docs/clients.md: Remove tootdonHaelwenn (lanodan) Monnier
Of course a proprietary client would send the messages home :D
2019-06-22support for tuples with more than 2 valuesAlex S
2019-06-22Rich Media Parser: Do not return just a title if nothing else is there.lain
2019-06-22Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""lain
This reverts commit b6af80f769195b5047ee8da07166f022c2e29b0a.
2019-06-22Support RUM indexes in the config generatorrinpatch
2019-06-22Merge branch 'mix_sem_ver_version_fix' into 'develop'rinpatch
Fixed mix version computed for underscore-containing branches See merge request pleroma/pleroma!1314
2019-06-22Merge branch 'fix/ecto-tasks-release' into 'develop'rinpatch
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
2019-06-22Merge branch 'bugfix/simple-notifications-for-non-create-activities' into ↵rinpatch
'develop' notifications: fix notification generation for non-create activities See merge request pleroma/pleroma!1323
2019-06-22notifications: fix notification generation for non-create activitiesWilliam Pitcock
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.
2019-06-22fix for int and modulesAlex S
2019-06-22Load the application before executing the create taskrinpatch
2019-06-22Ecto tasks: Resolve relative path using the application directoryrinpatch
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
2019-06-21Merge branch 'chore/update-bbcode' into 'develop'kaniini
mix: update bbcode dependency to v0.1.1 See merge request pleroma/pleroma!1321
2019-06-21Merge branch 'fix/fallback-config' into 'develop'rinpatch
Fallback to Config if Mix.Config does not exist, even if Config does not exist either See merge request pleroma/pleroma!1320
2019-06-21mix: update bbcode dependency to v0.1.1William Pitcock
2019-06-22Fallback to Config if Mix.Config does not exist, even if Config does notrinpatch
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.
2019-06-21Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini
implement anti link spam MRF See merge request pleroma/pleroma!1307
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:41:22 +0000