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 |
|