nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2859 commits 2 branches 0 tags 272 MiB
Commit graph

2070 commits

Author SHA1 Message Date
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