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.

Sign up for GitHub

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

Make usable/tested features live on master #208

Closed
wants to merge 25 commits into from
Closed

Make usable/tested features live on master #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
eab8cb8
Merge pull request #43 from OpenSourceHelpCommunity/develop
tapaswenipathak Jun 28, 2017
f2b7c23
Revert "Merge master and develop"
tapaswenipathak Jun 28, 2017
ad2677b
Merge pull request #44 from OpenSourceHelpCommunity/revert-43-develop
tapaswenipathak Jun 28, 2017
9e75204
Revert "Revert "Merge master and develop""
tapaswenipathak Jun 29, 2017
fd8262f
Merge pull request #45 from OpenSourceHelpCommunity/revert-44-revert-…
tapaswenipathak Jun 29, 2017
9b3bae2
For test
tapaswenipathak Jun 29, 2017
2b20af5
Empty commit to trigger build again
tapaswenipathak Jul 6, 2017
cffd158
Dummy commit to trigger build
tapaswenipathak Jul 6, 2017
8a27152
Added ADMINS to settings.py
Jul 8, 2017
dd1fcf0
Remove completed session
tapaswenipathak Jul 8, 2017
990e0c5
Added all ADMINS to settings.py
Jul 9, 2017
7c0467e
Merge pull request #64 from Utsal20/master
tapaswenipathak Jul 9, 2017
3b42064
Remove Joannah's session details; Add Utkarsh's session details
tapaswenipathak Jul 18, 2017
eece9d0
Update date
tapaswenipathak Jul 19, 2017
0a8443c
Add Manisma's session details; remove Utkarsh's
tapaswenipathak Sep 23, 2017
fc43dee
Add hyperlinks in Mansimar's session details
tapaswenipathak Sep 23, 2017
a72640a
Replace Mansimar's session details with Ranveer's
tapaswenipathak Oct 14, 2017
75e5b88
Correct year
tapaswenipathak Oct 14, 2017
bdebb4a
Fix travis failure, update settings.DATABASES
tapaswenipathak Oct 16, 2017
08b0bed
Predev merge (#138)
tapaswenipathak Oct 16, 2017
f979a86
fixing merge issues
tapaswenipathak Dec 24, 2017
8d50143
Merge develop to master;
tapaswenipathak Dec 24, 2017
075f32b
Hide signin/signup in production
tapaswenipathak Dec 24, 2017
261fc78
Fix main page ui issues
tapaswenipathak Dec 24, 2017
64e0c24
Flake8 cleanup;
tapaswenipathak Dec 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions oshc/main/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<li><a href="{% url 'journey' %}" target="_blank">Journey</a></li>
<li><a href="mailto:[email protected]" 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>
Expand Down