alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,544 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

5544 Commits

Author SHA1 Message Date
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
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
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
rinpatch f8c64dd4c0 Release Tasks: Ensure the application is loaded before getting the 
modules

Needed for non-rpc tasks to work
 2019-06-20 02:21:48 +03:00
rinpatch 8c7a382027 Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions 
instead of aliasing

This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common

Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
 2019-06-20 02:08:02 +03:00
rinpatch 524a66806d Merge branch 'user_sign_out_mix_task' into 'develop' 
User sign out mix task

See merge request pleroma/pleroma!1309
 2019-06-19 19:51:38 +00:00
Ivan Tashkinov 363618207c Apply suggestion to lib/mix/tasks/pleroma/user.ex 2019-06-19 19:39:53 +00:00
Ivan Tashkinov 71fb75b7ef User sign out mix task. 2019-06-19 22:29:36 +03:00
William Pitcock 21dacd4b15 unbreak polls 2019-06-19 16:33:49 +00:00
William Pitcock 736d8ad6be implement anti link spam MRF 2019-06-19 15:58:32 +00:00
rinpatch 2571e07fba pleroma_ctl: Rename arch to flavour because it also includes the libc 2019-06-19 14:59:18 +03:00
rinpatch 66f2cdcdb0 pleroma_ctl: add an update command 
Closes #988 and #1004
 2019-06-19 14:53:16 +03:00
rinpatch a6e3169cfc Make possible to override the branch name via a env variable 
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
 2019-06-19 14:40:39 +03:00
rinpatch cb4fcc740c Merge branch 'logger-level-for-migration-tasks' into 'develop' 
Logger level for migration tasks

Closes #983

See merge request pleroma/pleroma!1295
 2019-06-19 10:33:33 +00:00
Alexander Strizhakov e4fa6b99ac aliases for mix tasks 
ecto.migrate
ecto.rollback
 2019-06-19 10:33:33 +00:00
rinpatch df2dab69a7 Merge branch 'begone-the-dot-hack' into 'develop' 
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits

See merge request pleroma/pleroma!1298
 2019-06-19 10:22:23 +00:00
lain 5c6c4ce634 Merge branch 'fix/rich-media-hashtags-again' into 'develop' 
Rich Media: Skip Microformats hashtags

See merge request pleroma/pleroma!1304
 2019-06-19 08:48:41 +00:00
lain 90e47d4357 Merge branch 'update-frontend-c4fcdc71' into 'develop' 
Update bundled pleroma-fe to c4fcdc71

See merge request pleroma/pleroma!1303
 2019-06-19 08:37:34 +00:00
rinpatch a0a1361888 Refactor pleroma_ctl copying to a generic function for copying files into the release dir 2019-06-19 03:52:03 +03:00
rinpatch 035368d363 Rich Media: Skip Microformats hashtags 
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.

This MR adds a check for rel=tag, but I still left a.hashtag just in case
 2019-06-19 00:46:30 +03:00
rinpatch 431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
lain 966317e052 Merge branch 'deps/update-auto-linker' into 'develop' 
Deps: Update auto_linker

See merge request pleroma/pleroma!1300
 2019-06-18 20:47:36 +00:00
lain a392ad52ad Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop' 
Mastodon API: Sanitize display names

Closes #1000

See merge request pleroma/pleroma!1299
 2019-06-18 20:47:07 +00:00
Ivan Tashkinov 64bc7ac619 Minor edit (comment). 2019-06-18 17:15:26 +03:00
Ivan Tashkinov 9f45f93949 Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI. 2019-06-18 17:00:49 +03:00
rinpatch f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00