lambda
b19ee62252
Merge branch 'username-underscores' into 'develop'
...
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
2018-12-13 15:13:24 +00:00
Ivan Tashkinov
9e689de063
[ #114 ] Removed email_invite
implementation (to be addressed separately).
2018-12-13 16:24:30 +03:00
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed email_invite
implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
Ivan Tashkinov
908943352f
[ #114 ] Refactored password_reset
(moved to TwitterAPI). Added homepage links to password reset result pages.
2018-12-13 13:17:49 +03:00
href
7214d57463
Extended nicknames: allow dashes.
2018-12-12 21:48:54 +01:00
link0ff
51dd294c48
Allow to set both admin and moderator at the same time in mix task User
2018-12-12 22:45:40 +02:00
link0ff
a40ba3ba57
Fix toggle_activated in mix task User
2018-12-12 22:30:16 +02:00
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for confirm_email
and email_invite
(Twitter API).
2018-12-12 20:15:43 +03:00
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of with
statement clause in password_reset
.
2018-12-12 17:14:31 +03:00
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
2018-12-12 17:01:34 +03:00
Maksim Pechnikov
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
scarlett
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
lain
d6bf06ab4f
Fix warnings.
2018-12-10 20:49:06 +01:00
lambda
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
lambda
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
lambda
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
lambda
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
lambda
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
lambda
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
lain
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
Maksim Pechnikov
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
rinpatch
993c8c8bd4
Keep the shortdoc descriptive
2018-12-10 08:03:17 +03:00
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
Rin Toshaka
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
2018-12-09 20:17:35 +01:00
Maksim Pechnikov
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
Maksim Pechnikov
068353ac0b
formatting
2018-12-09 11:24:46 +03:00
Maksim Pechnikov
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:48:49 +01:00
lambda
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
lambda
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
lambda
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
lambda
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
Rin Toshaka
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
2018-12-08 08:30:34 +01:00
href
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
2018-12-07 20:03:30 +01:00
lambda
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
lambda
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
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
2018-12-07 19:44:45 +01:00
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
2018-12-07 19:36:44 +01:00
lambda
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
Rin Toshaka
09f20de0d7
Make gopher respect ip
2018-12-07 19:21:58 +01:00
Rin Toshaka
fd5c7b445f
Fix a typo
2018-12-07 19:19:14 +01:00
Rin Toshaka
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
2018-12-07 15:13:57 +01:00
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
2018-12-07 14:07:11 +01:00
href
3c925e9d88
Emojis: Alphabetical ordering
2018-12-07 11:16:27 +01:00
Ivan Tashkinov
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
2018-12-07 12:27:32 +03:00
lambda
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
rinpatch
4e2250b1dd
Fix a typo in relay.ex moduledoc
2018-12-07 11:41:01 +03:00
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
rinpatch
f7e23aee90
Oops
2018-12-07 10:44:54 +03:00
rinpatch
f661813807
Add mix pleroma.user unsubscribe to mix doc
2018-12-07 10:39:54 +03:00
rinpatch
08e10a70ec
Rename def to defval
2018-12-07 09:46:13 +03:00
Rin Toshaka
1d11c4cf11
add common.ex
2018-12-07 06:12:39 +01:00
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
Rin Toshaka
71d5cf9ed8
Remove unused vars from user.ex
2018-12-06 18:25:39 +01:00
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
2018-12-06 20:23:16 +03:00
Rin Toshaka
66313cda02
Update instance.ex for web push
2018-12-06 18:16:51 +01:00
Rin Toshaka
88f92693f2
Merge develop
2018-12-06 18:11:22 +01:00
Ivan Tashkinov
7b19487389
[ #394 ] Added users.tags
and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
Rin Toshaka
ca7b46fb3b
Refactor common functions to common.ex
2018-12-06 18:01:28 +01:00
Rin Toshaka
4a2a7ce636
Refactor common functions to common.ex
2018-12-06 18:00:24 +01:00
Rin Toshaka
3a84511df1
remove migrate_local_uploads.ex
2018-12-06 17:35:33 +01:00
kaniini
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
kaniini
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
kaniini
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
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
2018-12-06 17:42:07 +03:00
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
2018-12-06 14:00:41 +00:00
Egor Kislitsyn
6f36e903b0
use User.avatar_url
2018-12-06 20:55:46 +07:00
Egor Kislitsyn
79668c08fc
cleanup
2018-12-06 20:50:20 +07:00
scarlett
3dff61ebec
Harden re: detection.
2018-12-06 13:48:12 +00:00
Egor Kislitsyn
3d492795b7
clean up
2018-12-06 20:42:00 +07:00
Egor Kislitsyn
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
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
2018-12-06 19:56:56 +07:00
Egor Kislitsyn
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
Egor Kislitsyn
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
scarlett
6a6aaa0e1a
Use object.normalize.
2018-12-06 11:37:29 +00:00
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
kaniini
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
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
2018-12-06 10:48:05 +09:00
kaniini
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
Vald
194869c7db
added data attrs to twitter scrubber
2018-12-06 02:14:56 +05:30
lain
7d5720f2e4
Fix merge.
2018-12-05 21:31:02 +01:00
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
lain
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
lain
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
Vald
3ccfe226c0
added data attrs for user and tag
2018-12-06 01:05:41 +05:30
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
2018-12-05 21:48:21 +03:00
lain
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
Rin Toshaka
dfc9c08796
formating
2018-12-05 19:12:23 +01:00
Rin Toshaka
ffec96d8cc
Everything should use Mix.Task.Run
2018-12-05 19:05:37 +01:00
lambda
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
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
2018-12-05 20:23:28 +03:00
Rin Toshaka
facfd03bc1
Move relay tasks to relay.ex
2018-12-05 18:11:59 +01:00
Rin Toshaka
e8ba579efe
Switch from User.info_changeset because it is deprecated
2018-12-05 17:58:26 +01:00
Rin Toshaka
c3519132df
Sorry
2018-12-05 16:44:15 +01:00
Rin Toshaka
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
2018-12-05 16:41:50 +01:00
Maksim Pechnikov
c524c50509
fix/273
2018-12-05 17:32:06 +03:00
Rin Toshaka
9938fa3293
Merge develop to refactor/mix-tasks
2018-12-05 14:16:55 +01:00
Ivan Tashkinov
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
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
2018-12-05 11:48:50 +03:00
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
2018-12-05 16:08:34 +09:00
William Pitcock
956f3c75ca
user: put default user info when registering a user
2018-12-05 03:35:41 +00:00
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
2018-12-04 23:35:07 +00:00
kaniini
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
lain
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
kaniini
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
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
2018-12-04 18:30:01 +00:00
Rin Toshaka
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
2018-12-04 19:00:45 +01:00
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
2018-12-04 19:24:41 +03:00
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
2018-12-04 18:09:22 +03:00
Maksim Pechnikov
dd8aee332c
formatting the code
2018-12-04 17:48:55 +03:00
Maksim Pechnikov
a9e4a97586
update test
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
97252a27d9
fix http request in Salmon
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
2018-12-04 14:03:32 +03:00
lambda
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
lambda
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
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
2018-12-03 00:34:04 +03:00
rinpatch
a3953ca37a
Change @read_bytes to 35
2018-12-03 00:22:19 +03:00
Rin Toshaka
03b2d1016d
F O R M A T I N G
2018-12-02 20:27:49 +01:00
Rin Toshaka
57c71f8468
Move generate_invite to user.ex
2018-12-02 20:26:15 +01:00
Rin Toshaka
d924b6cd3d
Refactor copypasta to a private function in instance.ex
2018-12-02 20:04:33 +01:00
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
Rin Toshaka
cbe22deb51
Lint fix
2018-12-02 19:20:50 +01:00
Rin Toshaka
faf1f2b304
Move gen.instance to instance.ex
2018-12-02 19:18:06 +01:00
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
Rin Toshaka
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
lain
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
lain
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
href
43d5e4f7fa
Fix media proxy config defaults
2018-12-02 11:24:02 +01:00
lain
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
2018-12-02 11:20:49 +01:00
lain
91065e1968
Fix background updating / handling.
2018-12-02 11:20:38 +01:00
Rin Toshaka
31b3ac05ac
Lint fix
2018-12-02 10:01:17 +01:00
Rin Toshaka
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
2018-12-02 09:36:31 +01:00
rinpatch
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
2018-12-01 18:55:52 +03:00
rinpatch
6f174cbb71
Delete reactivate user task
2018-12-01 18:34:26 +03:00
rinpatch
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
2018-12-01 18:33:53 +03:00
rinpatch
fe2759bc9f
Attempt to resolve merge conflict
2018-12-01 18:12:27 +03:00
lain
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
lain
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
lain
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
kaniini
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
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
2018-11-30 19:12:03 +01:00
lambda
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
href
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
href
253da275bd
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
href
7282937f33
MIME: video/audio ogg detection
2018-11-30 18:02:52 +01:00
href
680716b3c9
Config docs
2018-11-30 18:02:51 +01:00
href
65e7307d68
Upload: bring back base_url
2018-11-30 18:02:50 +01:00
href
5d92431350
Fix deprecation warnings
2018-11-30 18:02:50 +01:00
href
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
href
97b00d366f
reverse_proxy: more headers
2018-11-30 18:00:57 +01:00
href
a2640c8088
Parse correctly content-type & do not forward content-length
2018-11-30 18:00:57 +01:00
href
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
lain
8f1fffebc6
Fix transmogrifier test.
2018-11-30 17:31:05 +01:00
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
2018-11-30 17:21:58 +01:00
lain
48b95a9b95
Assorted fixes.
2018-11-30 17:08:02 +01:00
lain
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
lain
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
2018-11-27 20:50:19 +01:00
lain
e002858071
Fix ostatus test.
2018-11-27 18:37:46 +01:00
lain
3c61df6b9e
Webfinger fixes.
2018-11-27 18:31:44 +01:00
lain
badbe2656c
More fixes.
2018-11-27 18:12:03 +01:00
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
2018-11-27 16:55:56 +00:00
lain
ec464ef20a
HTTP sig fixes.
2018-11-27 17:42:45 +01:00
rinpatch
0d229613df
Fix lint error
2018-11-27 19:07:58 +03:00
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
2018-11-27 17:51:02 +03:00
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
2018-11-27 00:12:03 +00:00
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
2018-11-26 23:59:30 +00:00
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
2018-11-26 23:52:19 +00:00
William Pitcock
8c05d19c7f
MRF: add user allowlist module
2018-11-26 23:51:58 +00:00
Mark Felder
6cc94404d7
Replace this hardcoded <title>
2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
2018-11-26 21:41:36 +01:00
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
2018-11-26 20:48:24 +01:00
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
2018-11-24 06:13:36 +01:00
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
2018-11-20 22:25:35 +00:00
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-11-20 20:16:16 +01:00
lain
d3180e0ccc
Raise on usage of old function.
2018-11-20 20:14:38 +01:00
lain
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
2018-11-20 19:02:23 +00:00
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
2018-11-20 18:58:08 +00:00
William Pitcock
c196754b4d
mastodon api: account view: fix tests
2018-11-20 18:54:48 +00:00
William Pitcock
ece8656733
streamer: fix fetching the user's block list
2018-11-20 18:47:12 +00:00
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
2018-11-20 18:47:00 +00:00
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
2018-11-20 18:42:28 +00:00
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
2018-11-20 18:41:44 +00:00
lain
6f0b9a5163
Fix Notification tests.
2018-11-20 19:15:28 +01:00
lain
2887f4ff1d
Fix formatter tests.
2018-11-20 19:07:01 +01:00
href
bc5cf2c192
Improved version string
2018-11-20 17:55:03 +01:00
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
2018-11-20 17:50:03 +01:00
eal
689b46efc8
RetryQueue: tiny refractor, add tests
2018-11-19 18:08:41 +02:00
href
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
lain
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
lain
40d9d2098c
Fix user updating from AP.
2018-11-18 22:15:03 +01:00
lain
cafa15131a
Mix format.
2018-11-18 21:41:35 +01:00
lain
4c918392c6
Fix most User tests.
2018-11-18 21:40:52 +01:00
lain
e7cd6e9739
Fix setting of keys.
2018-11-18 19:33:43 +01:00
lain
fc3bcf335e
Fix following locked users.
2018-11-18 18:53:50 +01:00
lain
d5af41b577
Fix note count update.
2018-11-18 18:52:21 +01:00
lain
6f90ceb2ed
Fix follower count test.
2018-11-18 18:49:17 +01:00
lain
812f5b058a
Fix blocking.
2018-11-18 18:40:31 +01:00
lain
756764266c
Formatting.
2018-11-18 18:27:04 +01:00
lain
b396dba425
Fix follower count setting.
2018-11-18 18:24:16 +01:00
lain
5c8f07f0a8
Fix note counting.
2018-11-18 18:17:56 +01:00
lain
47d883d3ab
Fix User deactivation.
2018-11-18 18:06:02 +01:00
lain
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
2018-11-18 18:04:42 +01:00
eal
62299be094
Federator: add retry queue.
2018-11-18 17:46:29 +02:00
William Pitcock
f6be980f4f
activitypub: object view: avoid leaking private details
2018-11-17 22:30:53 +00:00
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
William Pitcock
dfcfb184b1
activitypub: transmogrifier: make deletes secure
2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier
44b6200103
lib/mix/tasks/relay*: Use a with block
2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier
12ccf0c4f8
Change Relay from status
to {status, message}
2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names)
2018-11-17 22:12:13 +01:00
William Pitcock
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
2018-11-17 21:00:37 +00:00
William Pitcock
3d9266a8cb
federator: do origin containment when processing inbound messages
2018-11-17 20:43:43 +00:00
William Pitcock
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
2018-11-17 20:16:03 +00:00
William Pitcock
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
2018-11-17 20:15:59 +00:00
Haelwenn (lanodan) Monnier
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier
1a31d71187
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
7fbfd2db96
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
4a79b89dba
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
f48062488e
Add get endpoints for rights [AdminAPI]
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
c8b8f1d32c
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
011a2e36b1
lib/mix/tasks/make_admin.ex: New task
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
7076d45cb6
lib/pleroma/plugs/user_is_admin_plug.ex: Create
2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier
77d2fd54dd
admin_api_controller: Have some basic code
2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier
ee2e1328ad
admin_api_controller.ex: Create
2018-11-17 20:25:52 +01:00
William Pitcock
603fccf175
activitypub: fetch_object_from_id(): prefer actor
over attributedTo
to avoid spoofing
2018-11-17 18:17:17 +00:00
kaniini
05967472f2
Merge branch 'feature/uploader-mdii' into 'develop'
...
Feature / MDII Uploader
See merge request pleroma/pleroma!454
2018-11-17 16:41:09 +00:00
hakabahitoyo
59e079f641
fallbacking into local uploader
2018-11-17 20:16:25 +09:00
hakabahitoyo
8fd0556c78
better config reading
2018-11-17 18:14:42 +09:00
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
lambda
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
2018-11-16 18:13:47 +00:00
William Pitcock
c07464607d
http security: remove form-action from CSP definitions
2018-11-16 17:40:21 +00:00
lain
e8d8c84f79
Add better test for user search functionlity.
2018-11-16 18:31:32 +01:00
hakabahitoyo
55abd8482e
better config
2018-11-16 20:41:12 +09:00
hakabahitoyo
52224de39f
better extension detection
2018-11-16 20:22:36 +09:00
hakabahitoyo
4fbfacf5e1
debug
2018-11-15 16:08:55 +09:00
hakabahitoyo
8e707aba29
format
2018-11-15 15:11:59 +09:00
Hakaba Hitoyo
ebe658c169
debuf
2018-11-15 14:46:43 +09:00
Hakaba Hitoyo
698cb3587c
omplement mdii uploader
2018-11-15 14:38:45 +09:00
Hakaba Hitoyo
58af0787be
add mdii uploader
2018-11-15 14:19:10 +09:00
lain
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
lambda
cc45797f4e
Merge branch 'fix-media-proxy-filename' into 'develop'
...
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
2018-11-14 18:17:10 +00:00
kaniini
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
2018-11-14 08:52:08 +00:00
href
f52a1d1ec5
media_proxy: use path only to retrieve filename
2018-11-13 23:41:33 +01:00
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
href
9b553a1087
media_proxy: CSP, content-disposition
...
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
2018-11-13 15:58:02 +01:00
shibayashi
87c76a9a2f
Add __Host- prefix when secure flag is enabled
2018-11-13 00:32:38 +01:00
scarlett
0ce5623134
Merge branch 'twitter-api-null-display-name' into 'develop'
...
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
2018-11-12 17:08:54 +00:00
scarlett
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
2018-11-12 15:52:13 +00:00
kaniini
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
2018-11-12 15:30:42 +00:00
William Pitcock
2829fa4183
sample config: chase http_security change
2018-11-12 15:17:04 +00:00
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
2018-11-12 15:14:46 +00:00
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
2018-11-12 15:08:02 +00:00
KokaKiwi
1592fa2bea
Mastodon API: Fix list streaming
2018-11-11 14:18:15 +01:00
William Pitcock
df72978dce
csp plug: add support for certificate transparency
2018-11-11 06:55:44 +00:00
William Pitcock
331cf6ada1
csp plug: add sts support
2018-11-11 06:50:28 +00:00
William Pitcock
a2bf5426cb
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)
2018-11-11 06:42:14 +00:00
William Pitcock
f516e317ea
plugs: add CSPPlug
2018-11-11 06:10:21 +00:00
William Pitcock
419ed3a0ca
oauth: fix token decode regression
2018-11-11 05:26:39 +00:00
lambda
f745e823f0
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
...
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
2018-11-10 12:37:18 +00:00
William Pitcock
97e50f3191
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
...
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
2018-11-10 12:24:20 +00:00
Haelwenn (lanodan) Monnier
5ecb5629f6
lib/mix/tasks: s/@doc/@moduledoc/
2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier
5e3207045e
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier
64c0289893
lib/mix/tasks: Add remaining documentation for mix tasks
2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier
8b2541e4e7
Document the mix tasks in ex_doc instead
2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier
e1814bb322
Document mix tasks
2018-11-10 13:09:37 +01:00
William Pitcock
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
2018-11-10 12:04:09 +00:00