Skip to content
This repository has been archived by the owner on Aug 21, 2022. It is now read-only.

Pr/custom user model #97

Closed
wants to merge 80 commits into from
Closed

Pr/custom user model #97

wants to merge 80 commits into from

Conversation

marcelloromani
Copy link
Collaborator

@marcelloromani marcelloromani commented Feb 25, 2021 •
edited by codecakes
Loading

Trying to fix issues in #69

This change is Reviewable

ElijahAhianyo and others added 30 commits December 18, 2020 10:59
@ElijahAhianyo
added custom fields to user model
255c717
@ElijahAhianyo
added custom fields to user model
89f5966
added is_verfied property to user class
b7f6c4d
@ElijahAhianyo
MYC-180 #comment added custom fields to user mode
e3d5b51
@ElijahAhianyo
MYC-180 #comment corrected issue with line too long
4da3fd8
@ElijahAhianyo
Update settings.py
614d768
@milan-tom
Merge remote-tracking branch 'upstream/pr/custom-user-model' into add…
ae3902b 
…-test-cases

Merges updated upstream with testing branch
@milan-tom
Update initial ideas for testing
42ba57d
@ElijahAhianyo
Merge pull request #1 from milan-tom/pr/custom-user-model
29ce774 
Add is_verfied property to user class
@ElijahAhianyo
MYC-180 #comment resolved issue with phoneno field in migration
9ff589f
@ElijahAhianyo
Merge branch 'pr/custom-user-model' of github.com:ElijahAhianyo/covid…
5aa9b0a 
…X into pr/custom-user-model
@milan-tom
Merge remote-tracking branch 'upstream/pr/custom-user-model' into add…
7c6669f 
…-test-cases

Merge with updated upstream
@ElijahAhianyo
MYC-180 #comment added email_verified field
762d2f3
@milan-tom
Merge remote-tracking branch 'upstream/pr/custom-user-model' into add…
d3c3072 
…-test-cases

Merge with updated upstream after pr 1 merged
@milan-tom
MYC-180 #comment removed unnecessary whitespace
9b97d15
@milan-tom
MYC-184 #comment Updated test for unverified user
db769ac
@milan-tom
MYC-184 #comment Added tests for partially verified users
2bc31bd
@milan-tom
MYC-184 #comment Added test for fully verified user
6050a61
@ElijahAhianyo
Merge pull request Xcov19#2 from milan-tom/add-test-cases
e8374e5 
Add test cases
@milan-tom
MYC-184 #comment Incorporated verified arguments into create_user method
4d279a6
@milan-tom
MYC-184 #comment Loaded credentials from .ini file
f1d4cf6
@milan-tom
MYC-184 #comment Added newline at end of file
d4e825c
@milan-tom
MYC-184 #comment Added class to obtain credentials from .ini file
bcf643c
@milan-tom
MYC-184 #comment Moved classes to obtain credentials to common directory
fc15388
@milan-tom
MYC-184 #comment Added initial ideas for bytestream config file loader
454e6f8
@ElijahAhianyo
Merge pull request Xcov19#3 from milan-tom/add-test-cases
792bcb9 
Loaded credentials from .ini file for testing
@milan-tom
MYC-184 #comment Moved non-standard import statement
10eb3dd
@milan-tom
MYC-184 #comment Removed trailing whitespace
53b4d2c
@milan-tom
MYC-184 #comment Reformatted code
544a0e0
@milan-tom
MYC-184 #comment Removed trailing whitespace
ff1d7c0
codecakes and others added 17 commits February 6, 2021 11:35
@codecakes
Merge branch 'master' into present-run
0607807
@milan-tom
Merge remote-tracking branch 'upstream/present-run' into pr/custom-us…
07c2cc4 
…er-model
@codecakes
add back to resolve
725273b
@codecakes
WIP fixes to BUILD for pr/custom-user-model
0628ada
@milan-tom
MYC-184 #comment Moved common into apps
c5eec55
@milan-tom
MYC-184 #comment Moved test_config.ini
f3db20e
@milan-tom
MYC-184 #comment Moved test_config.ini into apps/auth_zero/config/dat…
234e4ef 
…a/test
@milan-tom
MYC-184 #comment Removed __init__.py file from config since it is not…
be6289d 
… used as a package
@milan-tom
MYC-184 #comment Removed __init__.py file from common since it no lon…
d4ffef0 
…ger needs to be used as an individual package
@milan-tom
MYC-184 #comment Updated interfaces for loading files
b460878
@marcelloromani
copy cert/key after bazel build to save time on change
33b6355
@codecakes
Merge branch 'devops/copy_certs_after_bazel_build' of github.com:marc…
ae6fe69 
…elloromani/covidX into elijah/pr/custom-user-model
@codecakes
Updated docker
8e3bb4d
@codecakes
Added BUILD, refined dockerfile & up-script; fixed config.py;
097fbdb
@milan-tom
MYC-184 #comment Merge changes from Feature/docker custom user model
fedd851
@milan-tom
MYC-184 #comment Fixed gitpod glitch
1a8ec38
@marcelloromani
Merge remote-tracking branch 'upstream/master' into pr/custom-user-model
801b72f
@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2021

This pull request introduces 1 alert when merging 801b72f into 8d9f7f9 - view on LGTM.com

new alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2021

This pull request introduces 1 alert when merging 6e59c55 into 8d9f7f9 - view on LGTM.com

new alerts:

  • 1 for 'import *' may pollute namespace

@ghost
Copy link

ghost commented Feb 25, 2021

DeepCode failed to analyze this pull request

Something went wrong despite trying multiple times, sorry about that.
Please comment this pull request with "Retry DeepCode" to manually retry, or contact us so that a human can look into the issue.

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2021

This pull request introduces 1 alert when merging 9362266 into 8d9f7f9 - view on LGTM.com

new alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2021

This pull request introduces 1 alert when merging 1bda33b into 8d9f7f9 - view on LGTM.com

new alerts:

  • 1 for 'import *' may pollute namespace

@lgtm-com
Copy link

lgtm-com bot commented Feb 25, 2021

This pull request introduces 1 alert when merging aca92d2 into 8d9f7f9 - view on LGTM.com

new alerts:

  • 1 for 'import *' may pollute namespace

@codecakes
Copy link
Contributor

@marcelloromani correct PR now sits at: #69 feel free to work on that

@milan-tom
Copy link
Collaborator

I have merged the changes from this pr into #69.

@milan-tom milan-tom closed this Mar 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@marcelloromani @codecakes @milan-tom @ElijahAhianyo