Commit graph

12 commits

Author SHA1 Message Date
William Pitcock
980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
William Pitcock
2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs 2018-12-14 13:05:29 +01: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
Maksim Pechnikov
c524c50509 fix/273 2018-12-05 17:32:06 +03:00
William Pitcock
3356c7d1e9 oauth plug: fix deactivated check 2018-11-20 18:47:00 +00:00
Martin Kühl
c2d592c9c5 Assign token to connection 2018-09-22 07:04:01 +02:00
lain
4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
Lain Iwakura
0ec5aeb8a7 Don't log in deactivated users. 2017-12-07 17:41:34 +01:00
Thog
59770c3f5c
Fix all compilation warnings 2017-11-19 02:22:07 +01:00
Roger Braun
d293ceb1b5 Add Mastodon frontend. 2017-11-12 14:23:05 +01:00
Roger Braun
2a298d70f9 Add very basic oauth and mastodon api support. 2017-09-06 19:06:25 +02:00