diff --git a/README.md b/README.md index 2f2bd24..e9f8fe7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ We are trying to create a medium where people who want to start with contributing to open sources and open source contributors meet and discuss their thoughts and questions([Getting Started With Open Source](https://github.com/tapasweni-pathak/Getting-Started-With-Contributing-to-Open-Sources)). -[Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP] +[Website](http://opensourcehelpcommunity.herokuapp.com/) ## Deployement details After every commit @@ -18,8 +18,10 @@ After every commit This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/) ## How to Contribute -This is an Open Source project and we would be happy to see contributors who report bugs and file feature requests submitting pull requests as well. This project adheres to the Collaborative [code of conduct](https://github.com/OpenSourceHelpCommunity/OpenSourceHelpCommunity.github.io/blob/develop/CODE_OF_CONDUCT.md). By participating, you expect to maintain the code of conduct. Before creating `New issue` and `Pull request`, please refer to the [template](docs). +This is an Open Source project and we would be happy to see contributors who report bugs and file feature requests submitting pull requests as well. This project adheres to the Collaborative [code of conduct](https://github.com/OpenSourceHelpCommunity/OpenSourceHelpCommunity.github.io/blob/develop/CODE_OF_CONDUCT.md). By participating, you expect to maintain the code of conduct. Before creating `New issue` and `Pull request`, please refer to the [template](docs). +Please submit your pull request on develop branch, it will have the most recent changes. +======= All the development is done on `predev` branch and once we're ready for testing the deployment in real environment with databases we merge the `predev` branch with the `develop` branch. When we're ready for new release we merge `develop` with `master` to deploy it on our main website. **Please submit your pull request based on `predev` branch.** ## Installations diff --git a/oshc/main/templates/base.html b/oshc/main/templates/base.html index 581fadd..47826e3 100644 --- a/oshc/main/templates/base.html +++ b/oshc/main/templates/base.html @@ -37,13 +37,13 @@ <li><a href="{% url 'journey' %}" target="_blank">Journey</a></li> <li><a href="mailto:opensourcehelpcommunity@gmail.com" target="_blank">Contact</a></li> <li><a href="https://opensourcehelp.herokuapp.com/" target="_blank">Join Us!</a></li> - {% if user.is_authenticated %} + <!--{% if user.is_authenticated %} <li><a href="#!">Hey {{ user.username }}!</a></li> <li><a href="{% url 'account_logout' %}">Logout</a></li> {% else %} <li><a href="{% url 'account_login' %}">Sign In</a></li> <li><a href="{% url 'account_signup' %}">Sign Up</a></li> - {% endif %} + {% endif %}--> </ul> </div> </div>