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
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
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
rinpatch
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
rinpatch
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
Haelwenn
3d76420512
Merge branch 'feature/pleroma-ctl-rpc' into 'develop'
...
pleroma_ctl: Run mix tasks using rpc instead of eval
See merge request pleroma/pleroma!1297
2019-06-18 01:57:32 +00:00
rinpatch
448d739b25
pleroma_ctl: Run mix tasks using rpc instead of eval
...
This patch changes pleroma_ctl to call into a running instance instead of spinning up
a new one for mix task execution. This significantly decreases the time needed
for mix task execution (on my machine for `pleroma_ctl user set rin --no-admin`
the difference is 0.2s vs 4.2s) and allows mix tasks to affect the
instance context, for example, this allows to clear the cache after user
deletion
2019-06-18 00:22:58 +03:00
rinpatch
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
Haelwenn
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
Alex S
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
rinpatch
efa445a75b
Merge branch 'issues/570' into 'develop'
...
[#570 ] add user:notification stream
See merge request pleroma/pleroma!1274
2019-06-16 10:33:25 +00:00
Maksim
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
rinpatch
57d54a9f09
Merge branch 'fix/991-version-generation' into 'develop'
...
version generation
Closes #991
See merge request pleroma/pleroma!1291
2019-06-16 10:18:47 +00:00
rinpatch
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
lain
549a410fda
Merge branch 'fix-for-new-isntances' into 'develop'
...
fix for new instances
See merge request pleroma/pleroma!1294
2019-06-16 10:01:15 +00:00
Alexander Strizhakov
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
Alex S
451593f45e
no print version to the shell
2019-06-16 11:48:15 +08:00
rinpatch
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
rinpatch
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00