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
rinpatch
89fa14f558
Merge branch 'fix/use-config-when-possible' into 'develop'
...
use Config in generated config when available
See merge request pleroma/pleroma!1319
5 years ago
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
5 years ago
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
5 years ago
William Pitcock
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
5 years ago
kaniini
4d69d066c4
Merge branch 'fix-rate-limit-test' into 'develop'
...
Fix rate limiter tests
See merge request pleroma/pleroma!1316
5 years ago
rinpatch
960d6b54e8
use Config in generated config when available
...
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.
5 years ago
rinpatch
6906db512d
Merge branch 'move-sample-configs' into 'develop'
...
Move config templates to priv so they can be found in releases
See merge request pleroma/pleroma!1318
5 years ago
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
5 years ago
Ivan Tashkinov
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
5 years ago
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
5 years ago
Egor Kislitsyn
fc6e661672
Fix rate limiter tests
5 years ago
rinpatch
2437f51284
Merge branch 'fix/config-gen-releases' into 'develop'
...
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
5 years ago
lain
3b48876cf0
Merge branch 'fix/dynamic-configuration' into 'develop'
...
Fixes for dynamic configuration
See merge request pleroma/pleroma!1313
5 years ago
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
5 years ago
rinpatch
e3e8a7dc0e
Disable rpc for instance gen
5 years ago
Ivan Tashkinov
f07003e218
Fixed mix version computed for underscore-containing branches to be of SemVer format.
5 years ago
rinpatch
45c67550f5
Merge branch 'develop' into fix/config-gen-releases
5 years ago
rinpatch
ba584364e9
Merge branch 'feature/release-update-script' into 'develop'
...
pleroma_ctl: add an update command
Closes #1004 and #988
See merge request pleroma/pleroma!1305
5 years ago
rinpatch
0e31d195af
Apply suggestion to rel/files/bin/pleroma_ctl
5 years ago