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
|
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 |
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 |
raeno
|
9ba4a1c5fe
|
Fixes #415. Properly handle nil and empty string by User.parse_bio
|
2018-12-10 01:01:43 +04: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 |
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 |
href
|
bdc8112e40
|
Media proxy: fix url encoding
|
2018-12-07 21:57:59 +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 |
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 |
Ivan Tashkinov
|
6ed5044c4e
|
[#394] Refactoring (using Ecto.Multi; "untag" route change).
|
2018-12-07 11:04:39 +03:00 |
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
2018-12-06 22:26:25 +03:00 |
Ivan Tashkinov
|
7bcb6a183a
|
[#394] Refactoring.
|
2018-12-06 20:23:16 +03: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 |
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 |