sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Pleroma/lib/pleroma
History
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
..
gopher
Fix supervisor order
2018-11-30 18:31:15 +01:00
http
remove httpoison_mock
2018-12-04 18:09:22 +03:00
plugs
Merge branch 'develop' into feature/compat/push-subscriptions
2018-12-06 20:15:16 +07:00
upload
Upload filter: anonymize filename
2018-11-30 19:33:34 +01:00
uploaders
status_code -> status
2018-12-04 14:04:06 +03:00
user
Fix merge.
2018-12-05 21:31:02 +01:00
web
Merge branch 'develop' into feature/compat/push-subscriptions
2018-12-06 20:15:16 +07:00
activity.ex
activity: add helper to fetch an activity's parent
2018-10-25 02:47:55 +00:00
application.ex
Merge branch 'develop' into feature/compat/push-subscriptions
2018-12-06 20:15:16 +07:00
config.ex
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
emoji.ex
Fix wrong return when finmoji is disabled
2018-11-05 21:17:47 +01:00
filter.ex
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
formatter.ex
added data attrs for user and tag
2018-12-06 01:05:41 +05:30
html.ex
added data attrs to twitter scrubber
2018-12-06 02:14:56 +05:30
list.ex
Add a test for List.get_lists_account_belongs
2018-10-19 21:24:15 +09:00
mime.ex
MIME: video/audio ogg detection
2018-11-30 18:02:52 +01:00
notification.ex
Merge branch 'develop' into feature/compat/push-subscriptions
2018-12-06 19:55:58 +07:00
object.ex
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
2018-12-06 10:26:17 +03:00
PasswordResetToken.ex
Format the code.
2018-03-30 15:01:53 +02:00
repo.ex
Phoenix skeleton
2017-03-17 17:09:58 +01:00
reverse_proxy.ex
Reverse proxy: default max read duration at 30 secs.
2018-11-30 19:12:03 +01:00
stats.ex
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
upload.ex
Upload: bring back base_url
2018-11-30 18:02:50 +01:00
user_invite_token.ex
Token-generating task
2018-06-17 14:30:07 +03:00
user.ex
user: put default user info when registering a user
2018-12-05 03:35:41 +00:00