Merge branch 'master' into 'app_template_WriteFreely'
# Conflicts: # hiboo/application/social.py # hiboo/application/templates/application_writefreely.html
Showing
- README.md 14 additions, 1 deletionREADME.md
- assets/app.js 1 addition, 5 deletionsassets/app.js
- assets/app.scss 0 additions, 0 deletionsassets/app.scss
- hiboo/account/home.py 8 additions, 2 deletionshiboo/account/home.py
- hiboo/account/templates/account_contact.html 0 additions, 6 deletionshiboo/account/templates/account_contact.html
- hiboo/account/templates/account_home.html 0 additions, 7 deletionshiboo/account/templates/account_home.html
- hiboo/account/templates/account_profiles.html 26 additions, 23 deletionshiboo/account/templates/account_profiles.html
- hiboo/account/templates/account_signin.html 0 additions, 6 deletionshiboo/account/templates/account_signin.html
- hiboo/account/templates/account_signup.html 0 additions, 6 deletionshiboo/account/templates/account_signup.html
- hiboo/application/social.py 33 additions, 1 deletionhiboo/application/social.py
- hiboo/application/templates/application_peertube.html 23 additions, 0 deletionshiboo/application/templates/application_peertube.html
- hiboo/models.py 1 addition, 1 deletionhiboo/models.py
- hiboo/profile/login.py 26 additions, 33 deletionshiboo/profile/login.py
- hiboo/profile/templates/profile_claim.html 0 additions, 6 deletionshiboo/profile/templates/profile_claim.html
- hiboo/profile/templates/profile_create.html 0 additions, 6 deletionshiboo/profile/templates/profile_create.html
- hiboo/profile/templates/profile_pick.html 5 additions, 25 deletionshiboo/profile/templates/profile_pick.html
- hiboo/profile/templates/profile_quick.html 14 additions, 2 deletionshiboo/profile/templates/profile_quick.html
- hiboo/service/forms.py 1 addition, 1 deletionhiboo/service/forms.py
- hiboo/sso/__init__.py 34 additions, 0 deletionshiboo/sso/__init__.py
- hiboo/sso/oidc.py 47 additions, 5 deletionshiboo/sso/oidc.py
Loading
Please register or sign in to comment