moon/spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
spc-pleroma/lib/pleroma/web
History
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
..
activity_pub
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-06 11:43:49 +03:00
admin_api
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-02 20:42:40 +03:00
auth
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
channels
Use User.get_cached* everywhere
2019-04-22 07:20:43 +00:00
common_api
CommonAPI: Create profile updates as public.
2019-10-05 14:53:50 +02:00
federator
[#1149] Refactored Oban workers API (introduced enqueue/3).
2019-08-31 21:58:42 +03:00
mailer
Fix Credo warnings
2019-04-20 19:57:43 +07:00
mastodon_api
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-06 11:43:49 +03:00
media_proxy
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
metadata
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
mongooseim
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
nodeinfo
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
oauth
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-06 11:43:49 +03:00
ostatus
Clean up views
2019-09-23 22:33:59 +00:00
pleroma_api/controllers
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-02 20:42:40 +03:00
push
Revert subscription refactoring.
2019-09-29 18:43:27 +03:00
rich_media
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
salmon
[#1149] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
streamer
streamer: worker: actually use should_send? consistently
2019-10-04 15:42:25 +00:00
templates
Add MastoFEController
2019-10-02 20:36:08 +07:00
twitter_api
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-10-02 20:42:40 +03:00
views
Add MastoFEController
2019-10-02 20:36:08 +07:00
web_finger
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
2019-07-24 19:29:01 +00:00
websub
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
xml
update copyright years to 2019
2018-12-31 15:41:47 +00:00
chat_channel.ex
Fix merge
2019-09-30 19:10:54 +07:00
controller_helper.ex
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
endpoint.ex
Add remote_ip plug
2019-09-27 21:59:23 +00:00
fallback_redirect_controller.ex
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
gettext.ex
update copyright years to 2019
2018-12-31 15:41:47 +00:00
masto_fe_controller.ex
Add MastoFEController
2019-10-02 20:36:08 +07:00
metadata.ex
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
oauth.ex
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
rel_me.ex
Replace Mix.env with Pleroma.Config.get(:env)
2019-06-06 23:59:51 +03:00
router.ex
Merge branch 'split-masto-api/leftovers' into 'develop'
2019-10-05 19:28:53 +00:00
translation_helpers.ex
Discard identifier, if empty
2019-10-01 19:43:22 +03:00
uploader_controller.ex
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
web.ex
Revert "Parallelize template rendering"
2019-09-10 22:01:45 +03:00