144e2e3e0b
Remove deprecated dedupe_media from the config template
2019-06-20 03:40:00 +03:00
fe3a830b80
Remove a useless binding from config template call
2019-06-20 02:34:19 +03:00
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
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
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
363618207c
Apply suggestion to lib/mix/tasks/pleroma/user.ex
2019-06-19 19:39:53 +00:00
71fb75b7ef
User sign out mix task.
2019-06-19 22:29:36 +03:00
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
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
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
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
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
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
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03:00
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
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
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
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
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
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
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
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
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
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
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
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
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
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
451593f45e
no print version to the shell
2019-06-16 11:48:15 +08:00
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00
e943905bd7
Add tests for report view
2019-06-16 01:30:14 +03:00
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
2019-06-15 15:09:14 +00:00
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
fb4af26d75
Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'
...
Mastodon API: Return the token needed for the chat.
See merge request pleroma/pleroma!1292
2019-06-15 09:56:01 +00:00
0632ed2f87
Apply suggestion to CHANGELOG.md
2019-06-15 09:27:27 +00:00
6745bc951c
Documentation: Document chat token response.
2019-06-15 11:11:45 +02:00
5ea6e26da0
Changelog: Document chat token.
2019-06-15 11:02:05 +02:00
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
e02f22d779
bugfix
2019-06-15 16:36:13 +08:00
501705438f
little fix
2019-06-15 16:24:49 +08:00
baf58c1234
version generation
2019-06-15 12:02:21 +08:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
rinpatch