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 |
|
kaniini
|
6ab58fdfa1
|
Merge branch 'dev_vald_fe/data_tag' into 'develop'
added data-user and data-tag attributes
Closes #410
See merge request pleroma/pleroma!504
|
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 |
|
Vald
|
3c8ffe7ed3
|
resolved activity view test
|
6 years ago |
|
Vald
|
028904c333
|
lint
|
6 years ago |
|
Vald
|
911a877576
|
resolved api and controller test failures
|
6 years ago |
|
lain
|
fdac215091
|
TwitterAPI: Show users their own network.
|
6 years ago |
|
Vald
|
743a09132b
|
linting
|
6 years ago |
|
Vald
|
812b20d49f
|
resolved formatter_test failures
|
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 |
|
lambda
|
991b62cb4d
|
Merge branch 'fix/mix-tasks-userinfo' into 'develop'
Update mix tasks that use User.info.info_changeset since it is deprecated
See merge request pleroma/pleroma!503
|
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
|
ba345e4c29
|
[#210] Formatting fix.
|
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
|
53797d19c5
|
[#210] Test update (replaced bang- with non-bang method).
|
6 years ago |
|
Ivan Tashkinov
|
be187f82f7
|
[#210] Further refactoring.
|
6 years ago |
|
lambda
|
22eff17912
|
Merge branch 'bugfix/408' into 'develop'
ensure user info is populated when registering users
See merge request pleroma/pleroma!500
|
6 years ago |
|
hakabahitoyo
|
a418547bdf
|
debug /api/v1/suggestions
|
6 years ago |
|
William Pitcock
|
0f061bea0c
|
tests: add regression test for bug #408
|
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 |
|
lambda
|
4a602230e4
|
Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'
bugfix: MRF simple media removal
See merge request pleroma/pleroma!497
|
6 years ago |
