develop #4

Merged
s460930 merged 29 commits from develop into master 2020-12-07 15:22:26 +01:00

29 Commits

Author SHA1 Message Date
65ebdf02b4 SMART-1 Merge pull request '[SMART-32] First version of client' (#3) from client_loginView into develop
Reviewed-on: #3
2020-12-07 15:20:33 +01:00
25f612007f First version of client
Only "Login page" implemented
2020-12-07 06:25:32 +01:00
518945c78d SMART-2 Merge pull request 'backend' (#2) from backend into develop
Reviewed-on: #2
2020-12-05 19:08:56 +01:00
4298190701 SMART-39 tests for UserRegistrationSerializer 2020-12-05 19:07:25 +01:00
0415872173 SMART-39 tests for UserLoginSerializer 2020-12-01 23:25:45 +01:00
18957651b8 SMART-38 removed one field in user profile 2020-12-01 23:00:42 +01:00
516365cbc6 SMART-38 register registration endpoint 2020-12-01 22:51:14 +01:00
63307a8388 SMART-37 implemented registration view 2020-12-01 22:49:16 +01:00
2cb31d70f0 added field to migrations to prevent build error in jenkins 2020-12-01 21:31:42 +01:00
ef8aeaab20 add build and test django in Jenkinsfile 2020-12-01 21:28:24 +01:00
1224e35bfe build and test django in Jenkinsfile 2020-12-01 21:25:52 +01:00
fd1432e89a test jenkins 2020-12-01 20:06:24 +01:00
534a7865c4 test jenkins 2020-12-01 19:59:11 +01:00
dc2efb5b76 test jenkins 2020-12-01 19:46:23 +01:00
6c29a37ae5 SMART-1 Merge pull request 'backend' (#1) from backend into develop
Reviewed-on: #1
2020-12-01 19:31:56 +01:00
e724d92cc4 SMART-30 test for User model 2020-12-01 19:25:25 +01:00
1c6089b674 SMART-30 tests for authenticate endpoint 2020-12-01 19:02:07 +01:00
56cada3122 SMART-30 registered user login url 2020-12-01 18:18:44 +01:00
5065f040fa SMART-31 created endpoint for logging the user 2020-12-01 18:01:35 +01:00
837709d553 SMART-31 created serializer for user login 2020-12-01 17:48:39 +01:00
6002ba94ec SMART-31 added JWT settings to settings.py 2020-12-01 17:37:25 +01:00
fb19e6ec6a Merge branch 'master' into backend 2020-11-30 23:22:15 +01:00
8863434733 SMART-29 created .gitignore 2020-11-30 23:13:32 +01:00
5ada608121 SMART-29 created .gitignore 2020-11-30 22:56:52 +01:00
df48b97ea8 SMART-29 created serializers for user model 2020-11-30 22:54:03 +01:00
60fac95880 SMART-29 created user_profile app, UserProfile class and made migration 2020-11-30 22:42:24 +01:00
91e974ac10 SMART-29 done first db migration 2020-11-30 22:17:41 +01:00
2cee353794 SMART-29 user app and django and implement UserManager and User class for further login logic 2020-11-30 22:10:22 +01:00
1956a64480 SMART-29 created django project 2020-11-30 21:41:59 +01:00