Ivan Tashkinov
|
37925cbe78
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
|
2019-04-02 14:05:34 +03:00 |
|
Ivan Tashkinov
|
590c935d95
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-02 13:50:12 +03:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
|
Ivan Tashkinov
|
804173fc92
|
[#923] Minor code readability fix.
|
2019-04-01 09:45:44 +03:00 |
|
Ivan Tashkinov
|
eadafc88b8
|
[#923] Deps config adjustment (no override for httpoison), code analysis issues fixes.
|
2019-04-01 09:28:56 +03:00 |
|
Ivan Tashkinov
|
baffdcc480
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-01 08:49:32 +03:00 |
|
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
2019-03-27 15:41:40 +03:00 |
|
Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
2019-03-27 15:39:35 +03:00 |
|
Ivan Tashkinov
|
af68a42ef7
|
[#923] Support for multiple OAuth consumer strategies.
|
2019-03-20 20:25:48 +03:00 |
|
Ivan Tashkinov
|
e17a9a1f66
|
[#923] Nickname & email selection for external registrations, option to connect to existing account.
|
2019-03-20 10:35:31 +03:00 |
|
Ivan Tashkinov
|
8d21859717
|
[#923] External User registration refactoring, password randomization.
|
2019-03-18 18:09:53 +03:00 |
|
Ivan Tashkinov
|
26b6354095
|
[#923] Support for multiple (external) registrations per user via Registration.
|
2019-03-18 17:23:38 +03:00 |
|
Ivan Tashkinov
|
2a96283efb
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
|
2019-03-18 10:26:41 +03:00 |
|
Ivan Tashkinov
|
2739057442
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
|
2019-03-15 17:11:00 +03:00 |
|
Ivan Tashkinov
|
aacbf0f570
|
[#923] OAuth: prototype of sign in / sign up with Twitter.
|
2019-03-15 17:08:03 +03:00 |
|
Ivan Tashkinov
|
63ab61ed3f
|
Sign in via Twitter (WIP).
|
2019-03-11 20:37:26 +03:00 |
|