e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
2018-12-12 17:14:31 +03:00
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
10c156d98f
[ #114 ] SMTP deps and config.
2018-12-12 17:01:34 +03:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
d6bf06ab4f
Fix warnings.
2018-12-10 20:49:06 +01:00
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
2018-12-10 19:08:35 +00:00
8aa646ca31
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
...
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
2018-12-10 19:06:39 +00:00
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
2018-12-10 19:05:16 +00:00
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
2018-12-10 19:04:06 +00:00
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
2018-12-10 19:03:06 +00:00
bda25b999b
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
...
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
2018-12-10 18:33:36 +00:00
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
993c8c8bd4
Keep the shortdoc descriptive
2018-12-10 08:03:17 +03:00
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
2018-12-09 20:17:35 +01:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
068353ac0b
formatting
2018-12-09 11:24:46 +03:00
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:48:49 +01:00
5436aaad4f
Merge branch 'fix/add-upload.ex' into 'develop'
...
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
2018-12-08 09:12:37 +00:00
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
2018-12-08 09:12:06 +00:00
8fa5c66eab
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
...
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
2018-12-08 09:11:18 +00:00
4976a8b05f
Merge branch 'fix/typo-relay-ex' into 'develop'
...
[#283 ] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
2018-12-08 09:08:56 +00:00
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
2018-12-08 08:30:34 +01:00
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
578051809f
Add uploadlimit to Twitter API config
2018-12-07 20:03:30 +01:00
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
2018-12-07 18:49:40 +00:00
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
2018-12-07 18:48:26 +00:00
134cc94cbd
Nodeinfo: remove null features; relay feature.
2018-12-07 19:44:45 +01:00
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
2018-12-07 19:36:44 +01:00
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
09f20de0d7
Make gopher respect ip
2018-12-07 19:21:58 +01:00
fd5c7b445f
Fix a typo
2018-12-07 19:19:14 +01:00
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
2018-12-07 15:13:57 +01:00
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
2018-12-07 14:07:11 +01:00
3c925e9d88
Emojis: Alphabetical ordering
2018-12-07 11:16:27 +01:00
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
2018-12-07 12:27:32 +03:00
8764f64690
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
...
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
2018-12-07 09:23:56 +00:00
4e2250b1dd
Fix a typo in relay.ex moduledoc
2018-12-07 11:41:01 +03:00
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
f7e23aee90
Oops
2018-12-07 10:44:54 +03:00
f661813807
Add mix pleroma.user unsubscribe to mix doc
2018-12-07 10:39:54 +03:00
08e10a70ec
Rename def to defval
2018-12-07 09:46:13 +03:00
1d11c4cf11
add common.ex
2018-12-07 06:12:39 +01:00
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
71d5cf9ed8
Remove unused vars from user.ex
2018-12-06 18:25:39 +01:00
7bcb6a183a
[ #394 ] Refactoring.
2018-12-06 20:23:16 +03:00
66313cda02
Update instance.ex for web push
2018-12-06 18:16:51 +01:00
88f92693f2
Merge develop
2018-12-06 18:11:22 +01:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
ca7b46fb3b
Refactor common functions to common.ex
2018-12-06 18:01:28 +01:00
4a2a7ce636
Refactor common functions to common.ex
2018-12-06 18:00:24 +01:00
3a84511df1
remove migrate_local_uploads.ex
2018-12-06 17:35:33 +01:00
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
2018-12-06 16:01:58 +00:00
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
2018-12-06 15:57:56 +00:00
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
2018-12-06 15:36:41 +00:00
2ae1128d9f
MastoAPI: Fix put_settings
2018-12-06 17:42:07 +03:00
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
2018-12-06 14:00:41 +00:00
6f36e903b0
use `User.avatar_url`
2018-12-06 20:55:46 +07:00
79668c08fc
cleanup
2018-12-06 20:50:20 +07:00
3dff61ebec
Harden re: detection.
2018-12-06 13:48:12 +00:00
3d492795b7
clean up
2018-12-06 20:42:00 +07:00
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
bac58b1524
show warning if VAPID is not set
2018-12-06 19:56:56 +07:00
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
2018-12-06 19:55:58 +07:00
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
6a6aaa0e1a
Use object.normalize.
2018-12-06 11:37:29 +00:00
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
2018-12-06 10:48:05 +09:00
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
2018-12-05 21:41:53 +00:00
194869c7db
added data attrs to twitter scrubber
2018-12-06 02:14:56 +05:30
7d5720f2e4
Fix merge.
2018-12-05 21:31:02 +01:00
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
3ccfe226c0
added data attrs for user and tag
2018-12-06 01:05:41 +05:30
3b5be09f45
[ #210 ] Stylistic change.
2018-12-05 21:48:21 +03:00
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
dfc9c08796
formating
2018-12-05 19:12:23 +01:00
ffec96d8cc
Everything should use Mix.Task.Run
2018-12-05 19:05:37 +01:00
5f0c2372bc
Merge branch 'support/oauth_fetch_token' into 'develop'
...
[#273 ] bugfix/273
See merge request pleroma/pleroma!502
2018-12-05 17:55:51 +00:00
c4f3c5e939
[ #210 ] Stylistic change.
2018-12-05 20:23:28 +03:00
facfd03bc1
Move relay tasks to relay.ex
2018-12-05 18:11:59 +01:00
e8ba579efe
Switch from User.info_changeset because it is deprecated
2018-12-05 17:58:26 +01:00
c3519132df
Sorry
2018-12-05 16:44:15 +01:00
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
2018-12-05 16:41:50 +01:00
c524c50509
fix/273
2018-12-05 17:32:06 +03:00
9938fa3293
Merge develop to refactor/mix-tasks
2018-12-05 14:16:55 +01:00
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
be187f82f7
[ #210 ] Further refactoring.
2018-12-05 11:48:50 +03:00
a418547bdf
debug /api/v1/suggestions
2018-12-05 16:08:34 +09:00
956f3c75ca
user: put default user info when registering a user
2018-12-05 03:35:41 +00:00
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
2018-12-04 23:35:07 +00:00
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
2018-12-04 19:00:18 +00:00
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
2018-12-04 19:54:42 +01:00
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
2018-12-04 18:41:00 +00:00
b57d83e3c9
MRF: simple policy: fix media removal
2018-12-04 18:30:01 +00:00
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
2018-12-04 19:00:45 +01:00
48e6193bf2
[ #210 ] Refactoring.
2018-12-04 19:24:41 +03:00
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
50e72f6c48
remove httpoison_mock
2018-12-04 18:09:22 +03:00
dd8aee332c
formatting the code
2018-12-04 17:48:55 +03:00
a9e4a97586
update test
2018-12-04 14:04:06 +03:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
97252a27d9
fix http request in Salmon
2018-12-04 14:04:06 +03:00
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
2018-12-04 14:03:32 +03:00
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
2018-12-03 16:14:58 +00:00
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
2018-12-03 00:34:04 +03:00
a3953ca37a
Change @read_bytes to 35
2018-12-03 00:22:19 +03:00
03b2d1016d
F O R M A T I N G
2018-12-02 20:27:49 +01:00
57c71f8468
Move generate_invite to user.ex
2018-12-02 20:26:15 +01:00
d924b6cd3d
Refactor copypasta to a private function in instance.ex
2018-12-02 20:04:33 +01:00
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
cbe22deb51
Lint fix
2018-12-02 19:20:50 +01:00
faf1f2b304
Move gen.instance to instance.ex
2018-12-02 19:18:06 +01:00
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
7983b0bdfe
Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.
2018-12-02 18:05:59 +01:00
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
43d5e4f7fa
Fix media proxy config defaults
2018-12-02 11:24:02 +01:00
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
2018-12-02 11:20:49 +01:00
91065e1968
Fix background updating / handling.
2018-12-02 11:20:38 +01:00
31b3ac05ac
Lint fix
2018-12-02 10:01:17 +01:00
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
2018-12-02 09:36:31 +01:00
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
2018-12-01 18:55:52 +03:00
6f174cbb71
Delete reactivate user task
2018-12-01 18:34:26 +03:00
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
2018-12-01 18:33:53 +03:00
fe2759bc9f
Attempt to resolve merge conflict
2018-12-01 18:12:27 +03:00
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
2018-11-30 18:15:44 +00:00
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
2018-11-30 19:12:03 +01:00
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
2018-11-30 17:57:06 +00:00
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
2018-11-30 18:31:15 +01:00
253da275bd
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
7282937f33
MIME: video/audio ogg detection
2018-11-30 18:02:52 +01:00
Ivan Tashkinov
Maksim Pechnikov
scarlett
lain
lambda
rinpatch
raeno
href
kaniini
Egor Kislitsyn
Hakaba Hitoyo
Vald
William Pitcock
Maxim Filippov