Merge branch 'master' into 'habibi_book'
# Conflicts: # config/devel.php
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- app/controller/user/UserDb.php 29 additions, 0 deletionsapp/controller/user/UserDb.php
- app/controller/user/UserUsecase.php 20 additions, 0 deletionsapp/controller/user/UserUsecase.php
- app/controller/user/routes.php 2 additions, 0 deletionsapp/controller/user/routes.php
- config/devel.php 1 addition, 1 deletionconfig/devel.php
- public/static/html/register.html 7 additions, 4 deletionspublic/static/html/register.html
- public/static/js/login.js 0 additions, 1 deletionpublic/static/js/login.js
- public/static/js/register.js 157 additions, 13 deletionspublic/static/js/register.js
Please register or sign in to comment