Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django Allauth added #20

Merged
merged 13 commits into from
Oct 11, 2015
Merged

Django Allauth added #20

merged 13 commits into from
Oct 11, 2015

Conversation

deshraj
Copy link
Member

@deshraj deshraj commented Sep 20, 2015

Django allauth is added to the project. Now, only the default templates provided by django allauth are to be changed.

@vnbang2003
Copy link
Contributor

@deshraj We should not be added library file as 410 files. Please update pull request according.
You can refer other repo pssi.org.in (https://github.com/pythonindia/pssi.org.in) and junction(https://github.com/pythonindia/junction) on usage.

@deshraj
Copy link
Member Author

deshraj commented Sep 26, 2015

Ok sure. I will remove the unnecessary files other than the templates file. Thanks for giving me the links for reference. :)

@vnbang2003
Copy link
Contributor

@deshraj you might need to update your source code also as i have checked base template for the project. Can you integrate django-allauth with login.html page ?

@deshraj
Copy link
Member Author

deshraj commented Sep 26, 2015

ok sure I will update my source code and will integrate django-allauth with login.html page. Let me know if anything else needs to be taken care of.

@deshraj
Copy link
Member Author

deshraj commented Oct 2, 2015

@vnbang2003 , Are we going to use only the simple authentication using emailid only ? I can see the new commits containing old login technique added.

@vnbang2003
Copy link
Contributor

we will use django -allauth . Just for Dev sprint purpose i made this simple login work.

@deshraj
Copy link
Member Author

deshraj commented Oct 2, 2015

Oh great. I am also attending the PyCon confrences tomorrow. Lets see if I can meet you there. :)

@@ -38,6 +38,9 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.sites',
'allauth',
'allauth.account',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can add this to THIRD_PARTY_APPS section.

@theskumar
Copy link
Member

Overall looks good. It seems you got some merge conflict, it would be great if you can rebase your branch against the latest code in this repository's master and also squash the commits to single commit if possible.

@vnbang2003
Copy link
Contributor

@deshraj Can you please udpate the pull request with latest code branch.

@deshraj
Copy link
Member Author

deshraj commented Oct 7, 2015

@vnbang2003 Sorry for the delay. Just updating the code. :)

@vnbang2003
Copy link
Contributor

@deshraj have added you in team . Can you please assign issue #3 to your self.

@deshraj
Copy link
Member Author

deshraj commented Oct 10, 2015

@vnbang2003 I have updated the PR. Please have a look and merge it if it seems fine. Do let me know if there is something to change.

@@ -8,21 +8,17 @@
from wye.profiles.views import login, logout, registration, ProfileView

urlpatterns = [
url(r'^django-admin/', include(admin.site.urls)),

url(r'', include('allauth.urls')),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let make /account/ as url ?

vnbang2003 added a commit that referenced this pull request Oct 11, 2015
@vnbang2003 vnbang2003 merged commit 7d2fc9e into pythonindia:master Oct 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants