moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,812 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

2812 Commits

Author SHA1 Message Date
kaniini 220de24002 Merge branch 'refactor/mix-tasks' into 'develop' 
Rebased !243

See merge request pleroma/pleroma!509
 2018-12-06 22:09:27 +00:00
Rin Toshaka f5726a2e12 Update README.md 2018-12-06 18:45:07 +01:00
Rin Toshaka 71d5cf9ed8 Remove unused vars from user.ex 2018-12-06 18:25:39 +01: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
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
kaniini 776179c2ed Merge branch 'feature/compat/push-subscriptions' into 'develop' 
Web Push Subscriptions

See merge request pleroma/pleroma!506
 2018-12-06 15:35:30 +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 0020b22688 add VAPID to test config 2018-12-06 20:17: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
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
 2018-12-05 20:47:44 +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
Vald 3c8ffe7ed3 resolved activity view test 2018-12-06 01:54:04 +05:30
Vald 028904c333 lint 2018-12-06 01:46:53 +05:30
Vald 911a877576 resolved api and controller test failures 2018-12-06 01:46:30 +05:30
lain fdac215091 TwitterAPI: Show users their own network. 2018-12-05 21:14:06 +01:00
Vald 743a09132b linting 2018-12-06 01:28:52 +05:30
Vald 812b20d49f resolved formatter_test failures 2018-12-06 01:27:08 +05:30
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
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
 2018-12-05 17:53:35 +00:00
Ivan Tashkinov c4f3c5e939 [#210] Stylistic change. 2018-12-05 20:23:28 +03:00