summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-06-21Merge branch 'fix/use-config-when-possible' into 'develop'rinpatch
use Config in generated config when available See merge request pleroma/pleroma!1319
2019-06-21Merge branch 'oauth_secure_redirect' into 'develop'kaniini
OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302
2019-06-21Merge branch 'revert-6f5a0cc1' into 'develop'kaniini
Revert "Merge branch 'fix/ogp-title' into 'develop'" See merge request pleroma/pleroma!1317
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ↵William Pitcock
previous name
2019-06-21Merge branch 'fix-rate-limit-test' into 'develop'kaniini
Fix rate limiter tests See merge request pleroma/pleroma!1316
2019-06-21use Config in generated config when availablerinpatch
Mix.Config is deprecated and does not work on OTP releases. However we can't fully switch to Config because it is not present in Elixir < 1.9. I tried to evaluate if Config is available at runtime, but for some weird reason OTP releases crash if I do that.
2019-06-21Merge branch 'move-sample-configs' into 'develop'rinpatch
Move config templates to priv so they can be found in releases See merge request pleroma/pleroma!1318
2019-06-21Move config templates to priv so they can be found in releasesrinpatch
2019-06-21Fixed branch name substitutions for mix version (to comply to SemVer format).Ivan Tashkinov
2019-06-21Revert "Merge branch 'fix/ogp-title' into 'develop'"feld
This reverts merge request !1277
2019-06-21Fix rate limiter testsEgor Kislitsyn
2019-06-20Merge branch 'fix/config-gen-releases' into 'develop'rinpatch
Refactor mix tasks a bit and make config generator work with releases See merge request pleroma/pleroma!1312
2019-06-20Merge branch 'fix/dynamic-configuration' into 'develop'lain
Fixes for dynamic configuration See merge request pleroma/pleroma!1313
2019-06-20Fixes for dynamic configurationAlexander Strizhakov
2019-06-20Disable rpc for instance genrinpatch
2019-06-20Fixed mix version computed for underscore-containing branches to be of ↵Ivan Tashkinov
SemVer format.
2019-06-20Merge branch 'develop' into fix/config-gen-releasesrinpatch
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 01:45:40 +0000