itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
5567 commits 3 branches 2 tags 277 MiB
Commit graph

5567 commits

This branch
This branch
All branches
Author SHA1 Message Date
aries
4bac13966b modify config.md for S3 2019-06-24 01:10:55 +09:00
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
 2019-06-23 06:53:38 +00:00
rinpatch
875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default 2019-06-23 09:31:39 +03:00
kaniini
27b9605de0 Merge branch 'rich_media_titles_two' into 'develop' 
Rich media titles two

See merge request pleroma/pleroma!1325
 2019-06-23 05:43:11 +00:00
kaniini
8b7860f12f Merge branch 'admin-config' into 'develop' 
Admin config

See merge request pleroma/pleroma!1328
 2019-06-23 05:42:37 +00:00
Alex S
b37ede5df3 log capturing 2019-06-23 08:16:28 +03:00
Alex S
982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Haelwenn
72f365df07 Merge branch 'docs/remove-tootdon' into 'develop' 
docs/clients.md: Remove tootdon

See merge request pleroma/pleroma!1326
 2019-06-22 17:44:06 +00:00
Haelwenn
066f4622d6 Merge branch 'feature/rum-config-generator' into 'develop' 
Support RUM indexes in the config generator

See merge request pleroma/pleroma!1324
 2019-06-22 17:38:04 +00:00
Haelwenn (lanodan) Monnier
ab79a18b77
docs/clients.md: Remove tootdon 
Of course a proprietary client would send the messages home :D
 2019-06-22 19:34:30 +02:00
Alex S
410add1c30 support for tuples with more than 2 values 2019-06-22 17:30:53 +03:00
lain
0e415921cd Rich Media Parser: Do not return just a title if nothing else is there. 2019-06-22 16:22:59 +02:00
lain
58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" 
This reverts commit b6af80f769.
 2019-06-22 15:12:57 +02:00
rinpatch
3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
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
 2019-06-22 09:20:11 +00:00
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
 2019-06-22 09:19:10 +00:00
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
 2019-06-22 06:55:32 +00:00
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.
 2019-06-22 06:44:47 +00:00
Alex S
f0fccb7578 fix for int and modules 2019-06-22 09:01:30 +03:00
rinpatch
19f16e829d Load the application before executing the create task 2019-06-22 04:33:46 +03:00
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
 2019-06-22 04:17:04 +03:00
kaniini
ddd04d1c52 Merge branch 'chore/update-bbcode' into 'develop' 
mix: update bbcode dependency to v0.1.1

See merge request pleroma/pleroma!1321
 2019-06-21 23:54:37 +00:00
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
 2019-06-21 23:43:14 +00:00
William Pitcock
481932309f mix: update bbcode dependency to v0.1.1 2019-06-21 23:42:50 +00:00
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.
 2019-06-22 02:29:49 +03:00
kaniini
55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop' 
implement anti link spam MRF

See merge request pleroma/pleroma!1307
 2019-06-21 22:56:54 +00:00
rinpatch
89fa14f558 Merge branch 'fix/use-config-when-possible' into 'develop' 
use Config in generated config when available

See merge request pleroma/pleroma!1319
 2019-06-21 22:43:39 +00:00
kaniini
e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop' 
OAuth security improvements (`redirect_uri` listing enforcement)

See merge request pleroma/pleroma!1302
 2019-06-21 22:31:12 +00:00
kaniini
720412bf24 Merge branch 'revert-6f5a0cc1' into 'develop' 
Revert "Merge branch 'fix/ogp-title' into 'develop'"

See merge request pleroma/pleroma!1317
 2019-06-21 22:28:46 +00:00
William Pitcock
127a5a7d65 change the anti-link-spam MRF implementation to use old_user? instead of the previous name 2019-06-21 22:27:14 +00:00
kaniini
4d69d066c4 Merge branch 'fix-rate-limit-test' into 'develop' 
Fix rate limiter tests

See merge request pleroma/pleroma!1316
 2019-06-21 22:25:09 +00:00
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.
 2019-06-21 22:01:59 +03:00
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
 2019-06-21 17:27:00 +00:00
rinpatch
e76115989a Move config templates to priv so they can be found in releases 2019-06-21 19:54:04 +03:00
Ivan Tashkinov
259ffe0062 Fixed branch name substitutions for mix version (to comply to SemVer format). 2019-06-21 17:19:29 +03:00
feld
b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'" 
This reverts merge request !1277
 2019-06-21 11:36:32 +00:00
Egor Kislitsyn
fc6e661672 Fix rate limiter tests 2019-06-21 16:47:16 +07:00
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
 2019-06-20 21:25:34 +00:00
lain
3b48876cf0 Merge branch 'fix/dynamic-configuration' into 'develop' 
Fixes for dynamic configuration

See merge request pleroma/pleroma!1313
 2019-06-20 17:43:57 +00:00
Alexander Strizhakov
32320c1ee9 Fixes for dynamic configuration 2019-06-20 17:43:57 +00:00
rinpatch
e3e8a7dc0e Disable rpc for instance gen 2019-06-20 18:28:56 +03:00
Ivan Tashkinov
f07003e218 Fixed mix version computed for underscore-containing branches to be of SemVer format. 2019-06-20 17:54:16 +03:00
rinpatch
45c67550f5 Merge branch 'develop' into fix/config-gen-releases 2019-06-20 11:51:16 +03:00
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
 2019-06-20 08:50:26 +00:00
rinpatch
0e31d195af Apply suggestion to rel/files/bin/pleroma_ctl 2019-06-20 08:12:56 +00:00
rinpatch
4974988f03 Export PLEROMA_BUILD_BRANCH 2019-06-20 11:02:05 +03:00
William Pitcock
630ac6a921 docs: better description for mrf anti link spam 2019-06-20 03:01:03 +00:00
rinpatch
69070e641d Allow setting upload/static directories in the config generator 2019-06-20 03:59:16 +03:00
rinpatch
144e2e3e0b Remove deprecated dedupe_media from the config template 2019-06-20 03:40:00 +03:00
rinpatch
fe3a830b80 Remove a useless binding from config template call 2019-06-20 02:34:19 +03:00