sergiotarxz/Pleroma
sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Pleroma/lib/pleroma/web
History
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	mix.lock
#	test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
..
activity_pub
Merge branch 'features/mrf-reasons' into 'develop'
2020-07-15 14:00:22 +00:00
admin_api
Config/Docs: Expand behaviour suggestions at runtime
2020-07-12 17:23:33 +02:00
api_spec
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
auth
copyright update
2020-05-18 15:15:51 +03:00
channels
Update Copyrights
2020-03-03 16:44:49 -06:00
common_api
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
federator
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
feed
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
mailer
…
mastodon_api
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-07-19 20:05:37 +03:00
media_proxy
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-07-19 20:05:37 +03:00
metadata
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
2020-04-01 12:55:52 +00:00
mongooseim
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
2020-05-14 08:57:38 -05:00
nodeinfo
Nodeinfo: Add chat information back in.
2020-06-26 13:04:15 +02:00
oauth
Credo fixes.
2020-06-29 14:09:03 +02:00
ostatus
OStatusController: Add Mastodon activity compat route.
2020-05-22 17:11:59 +02:00
pleroma_api
AccountController: Remove unused update_? routes.
2020-07-07 16:53:20 +02:00
preload
Preloaders: Remove status_net preloader
2020-07-06 12:24:45 +02:00
push
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
rich_media
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
2020-07-07 11:21:05 -05:00
static_fe
Use atoms as keys in ActivityPub.fetch_* functions options
2020-06-04 21:36:26 +04:00
streamer
Streamer: Don't filter out announce notifications.
2020-07-04 17:11:37 +02:00
templates
TOTP length is configurable, so we can't hardcode this here.
2020-07-17 08:19:49 -05:00
twitter_api
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
views
Rename user.settings column
2020-06-30 11:50:53 -05:00
web_finger
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
2020-05-06 08:46:45 +00:00
xml
Update Copyrights
2020-03-03 16:44:49 -06:00
api_spec.ex
Add OpenAPI spec for SubscriptionController
2020-05-05 16:43:00 +04:00
chat_channel.ex
[#2456] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
controller_helper.ex
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
embed_controller.ex
Add embeddable posts
2020-03-20 21:46:26 +04:00
endpoint.ex
static-fe.css: Restore and move to /priv/static/static-fe
2020-05-02 08:28:42 +02:00
fallback_redirect_controller.ex
encode data properly
2020-06-03 16:34:03 -04:00
gettext.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
masto_fe_controller.ex
Add warning against parsing/reusing MastoFE settings blob
2020-06-22 23:45:29 +02:00
metadata.ex
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
oauth.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
preload.ex
add status_net/config
2020-06-03 16:34:03 -04:00
rel_me.ex
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
router.ex
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-07-19 20:05:37 +03:00
translation_helpers.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
uploader_controller.ex
Update Copyrights
2020-03-03 16:44:49 -06:00
web.ex
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
2020-04-30 18:19:51 +03:00