Commit Graph

62 Commits

Author SHA1 Message Date
6ff054c84b SMART-19 Merge pull request 'develop' (#10) from develop into master
Reviewed-on: #10
2020-12-21 14:25:53 +01:00
86afc9b2f8 SMART-18 Merge pull request 'projects_view' (#9) from projects_view into develop
Reviewed-on: #9
2020-12-21 14:25:18 +01:00
8db34d386c SMART-49 implemented add project view 2020-12-21 14:24:03 +01:00
0aad49aaec SMART-49 implemented add project view 2020-12-21 14:23:52 +01:00
ad6a8a4e3c Intial work on projects view 2020-12-21 11:33:45 +01:00
7e9553eeca SMART-19 Merge pull request 'develop' (#8) from develop into master
Reviewed-on: #8
2020-12-17 17:03:00 +01:00
e4f1940bea SMART-52 implementation of tests for projects' endpoints 2020-12-17 17:00:32 +01:00
b313e583dc SMART-52 implementation of retrieve user's projects endpoint 2020-12-15 16:33:28 +01:00
c3a50e0552 SMART-48 change implementation of create project endpoint 2020-12-15 16:28:25 +01:00
9487df0e34 SMART-48 implemented create project endpoint 2020-12-14 20:29:50 +01:00
97c968c3cb SMART-48 implemented create project endpoint 2020-12-14 20:29:38 +01:00
ee9261f504 SMART-48 created new model in db - Project, and made migration 2020-12-14 20:09:31 +01:00
29d60411c1 SMART-48 create new django app - project 2020-12-14 20:01:40 +01:00
afdd6c70eb SMART-3 Merge pull request 'develop' (#7) from develop into master
Reviewed-on: #7
2020-12-14 16:36:46 +01:00
706b719be4 fixed client app python requirements 2020-12-14 13:29:06 +01:00
d881fe065b SMART-36 & SMART-3 Merge pull request 'register_profile_views' (#6) from register_profile_views into develop
Reviewed-on: #6
2020-12-14 13:26:38 +01:00
fb65e04600 SMART-43 implemented user profile view 2020-12-14 13:24:23 +01:00
5080ab5c8d Updated client app with 2 new views 2020-12-14 07:02:08 +01:00
a9bf9e91f2 How to run in readme 2020-12-09 21:58:18 +01:00
4689b3bae5 Merge branch 'backend' into develop 2020-12-09 21:49:23 +01:00
f061ad93fe SMART-42 change status code in response when user profile does not exist 2020-12-09 21:49:10 +01:00
d2e6f7660d SMART-3 Merge pull request 'backend' (#5) from backend into develop
Reviewed-on: #5
2020-12-09 20:59:39 +01:00
dc2dd3773f Merge branch 'develop' into backend 2020-12-09 20:58:48 +01:00
f3e9c33034 SMART-42 added tests for retrieve user profile endpoint 2020-12-09 20:57:11 +01:00
dae0990207 SMART-42 added username field to UserProfile entity 2020-12-09 19:36:14 +01:00
3c6736c98c SMART-42 registered retreive user profile endpoint 2020-12-09 19:24:41 +01:00
0b2da88942 SMART-42 implemented retrieve user profile view 2020-12-09 19:21:30 +01:00
26cd11e7ce Merge pull request 'develop' (#4) from develop into master
Reviewed-on: #4
2020-12-07 15:22:25 +01:00
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