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
6 years ago
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
Egor Kislitsyn
6f36e903b0
use `User.avatar_url`
6 years ago
Egor Kislitsyn
79668c08fc
cleanup
6 years ago
scarlett
3dff61ebec
Harden re: detection.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
6 years ago
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
6 years ago
Egor Kislitsyn
04a48286e6
Add web push support
6 years ago
scarlett
6a6aaa0e1a
Use object.normalize.
6 years ago
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
6 years ago
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
6 years ago
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
6 years ago
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
Vald
194869c7db
added data attrs to twitter scrubber
6 years ago
lain
7d5720f2e4
Fix merge.
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Vald
3ccfe226c0
added data attrs for user and tag
6 years ago
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Rin Toshaka
dfc9c08796
formating
6 years ago
Rin Toshaka
ffec96d8cc
Everything should use Mix.Task.Run
6 years ago
lambda
5f0c2372bc
Merge branch 'support/oauth_fetch_token' into 'develop'
...
[#273 ] bugfix/273
See merge request pleroma/pleroma!502
6 years ago
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
Rin Toshaka
facfd03bc1
Move relay tasks to relay.ex
6 years ago
Rin Toshaka
e8ba579efe
Switch from User.info_changeset because it is deprecated
6 years ago
Rin Toshaka
c3519132df
Sorry
6 years ago
Rin Toshaka
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
6 years ago
Maksim Pechnikov
c524c50509
fix/273
6 years ago
Rin Toshaka
9938fa3293
Merge develop to refactor/mix-tasks
6 years ago
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.
6 years ago
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
6 years ago
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
6 years ago
William Pitcock
956f3c75ca
user: put default user info when registering a user
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
Rin Toshaka
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
6 years ago
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
97252a27d9
fix http request in Salmon
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
6 years ago
rinpatch
a3953ca37a
Change @read_bytes to 35
6 years ago
Rin Toshaka
03b2d1016d
F O R M A T I N G
6 years ago
Rin Toshaka
57c71f8468
Move generate_invite to user.ex
6 years ago
Rin Toshaka
d924b6cd3d
Refactor copypasta to a private function in instance.ex
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
Rin Toshaka
cbe22deb51
Lint fix
6 years ago
Rin Toshaka
faf1f2b304
Move gen.instance to instance.ex
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
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.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
href
43d5e4f7fa
Fix media proxy config defaults
6 years ago
lain
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
6 years ago
lain
91065e1968
Fix background updating / handling.
6 years ago
Rin Toshaka
31b3ac05ac
Lint fix
6 years ago
Rin Toshaka
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
6 years ago
rinpatch
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
6 years ago
rinpatch
6f174cbb71
Delete reactivate user task
6 years ago
rinpatch
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
6 years ago
rinpatch
fe2759bc9f
Attempt to resolve merge conflict
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
lambda
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
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.
6 years ago
href
253da275bd
Pleroma.Config.delete/1
6 years ago
href
7282937f33
MIME: video/audio ogg detection
6 years ago
href
680716b3c9
Config docs
6 years ago
href
65e7307d68
Upload: bring back base_url
6 years ago
href
5d92431350
Fix deprecation warnings
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
97b00d366f
reverse_proxy: more headers
6 years ago
href
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
8f1fffebc6
Fix transmogrifier test.
6 years ago
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
e002858071
Fix ostatus test.
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
badbe2656c
More fixes.
6 years ago
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
lain
ec464ef20a
HTTP sig fixes.
6 years ago
rinpatch
0d229613df
Fix lint error
6 years ago
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
William Pitcock
8c05d19c7f
MRF: add user allowlist module
6 years ago
Mark Felder
6cc94404d7
Replace this hardcoded <title>
6 years ago
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
d3180e0ccc
Raise on usage of old function.
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
6 years ago
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
William Pitcock
ece8656733
streamer: fix fetching the user's block list
6 years ago
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
6 years ago
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
6 years ago
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
6 years ago
lain
6f0b9a5163
Fix Notification tests.
6 years ago
lain
2887f4ff1d
Fix formatter tests.
6 years ago
href
bc5cf2c192
Improved version string
6 years ago
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
eal
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
lain
fbb70d25fe
Several twitter api fixes.
6 years ago
lain
40d9d2098c
Fix user updating from AP.
6 years ago
lain
cafa15131a
Mix format.
6 years ago
lain
4c918392c6
Fix most User tests.
6 years ago
lain
e7cd6e9739
Fix setting of keys.
6 years ago
lain
fc3bcf335e
Fix following locked users.
6 years ago
lain
d5af41b577
Fix note count update.
6 years ago