From f2b7c23d6e9583da64af1637eb7c1790cf251b5f Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Wed, 28 Jun 2017 22:33:19 +0530 Subject: [PATCH 01/19] Revert "Merge master and develop" --- CODE_OF_CONDUCT.md | 46 ---- Procfile | 1 - README.md | 2 - oshc/main/static/main/css/.app.css.swp | Bin 0 -> 12288 bytes oshc/main/static/main/css/app.css | 256 ++++----------------- oshc/main/static/main/images/oshc-logo.png | Bin 4217 -> 9420 bytes oshc/main/static/main/js/script.js | 8 - oshc/main/templates/base.html | 105 ++++----- oshc/main/templates/header.html | 6 +- oshc/main/templates/index.html | 119 ++++------ requirements.txt | 14 +- 11 files changed, 143 insertions(+), 414 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md delete mode 100644 Procfile create mode 100644 oshc/main/static/main/css/.app.css.swp delete mode 100644 oshc/main/static/main/js/script.js diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 0281773..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensourcehelpcommunity@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Procfile b/Procfile deleted file mode 100644 index 23294d2..0000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: gunicorn --pythonpath oshc oshc.wsgi --log-file - diff --git a/README.md b/README.md index 2925473..2e51847 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,10 @@ We are trying to create a medium where people who want to start with contributin [Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP] -After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch. This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/). Feel free to suggest a better design. -Please submit your pull request on develop branch, it will have the most recent changes. ## Installations Run diff --git a/oshc/main/static/main/css/.app.css.swp b/oshc/main/static/main/css/.app.css.swp new file mode 100644 index 0000000000000000000000000000000000000000..831afb69970cbc72947d746c5c0d500042db2fe0 GIT binary patch literal 12288 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 literal 4217 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 + - {% include 'header.html' %} - - {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} + {% include 'header.html' %} + + + {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} + - -
- {% block content %}{% endblock %} - {% block footer %} -
-
-
-
- -
-
-
-
- © 2017 Open Source Help Community -
-
-
-
- {% endblock %} -
+
+ +
+ +
+ {% block content %}{% endblock %} +
+ + + - - - diff --git a/oshc/main/templates/header.html b/oshc/main/templates/header.html index 7d7b59f..9366ea9 100644 --- a/oshc/main/templates/header.html +++ b/oshc/main/templates/header.html @@ -1,11 +1,13 @@ {% load static %} + {% if site.author %}{% endif %} {% if site.description %}{% endif %} + - + - + diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 9226ea3..5abd819 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -1,79 +1,60 @@ {% extends 'base.html' %} {% load static %} {% block content %} -
-
-
- Open Source Help Community Logo -

Open Source Help Community

-

A Virtual Platform To Help People To Start Contributing To Open Source Projects

-
-
-
+
+
+ +

Open Source Help Community

+

A Virtual Platform To Help People To Start Contributing To Open Source Projects.

+
+
-
-
-

Our Mission

-

- "Open Source Help Community is an a virtual platform to help people to start contributing to open source projects" -

-

- OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects. -

-
-

- If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com -

-
-
-
-
-

Upcoming Sessions

+
-
-
-
-
-

Open Source Contributor's Chat Session with Himanshu Mishra

-
-
- Himanshu is a pre-final year undergraduate student at IIT Kharagpur. He has been a Google Summer of Code student in 2015 and 2016 and is currently a mentor in Python Software Foundation. -
- Date: Wed, June 21, 2017 8:30 PM – 9:30 PM IST -
- -
-
-
-
-

Open Source Contributor's Chat Session with Joannah Nanjekye

-
-
- Joannah Nanjekye is a software engineer that graduated from Makerere University in Uganda with a Bachelor of Science Degree in software Engineering. -
- Sat, July 8, 2017 5:30 PM – 6:30 PM IST -
- -
-
-
+
-
- -
-
-
-
+
+

Our Mission

+

Open Source Help Community is an a virtual platform to help people to start contributing to open source projects.

OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects.

+

If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com.

+

Recent Tweets

+ +
+
+

Upcoming Sessions +

+ + +
+ + + + +
+ + +
+
+
+

© 2017 OSHC

+
+
+ + + +
+
+

Back to top

+
+ +
+ + +
+
{% endblock %} diff --git a/requirements.txt b/requirements.txt index 89d5bdb..6405be5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,10 @@ -Django==1.11.2 -gunicorn==19.7.1 -pytz==2017.2 -whitenoise==3.3.0 +Django==1.7.6 +South==1.0.1 +argparse==1.2.1 +wsgiref==0.1.2 +dj-database-url==0.3.0 +dj-static==0.0.6 +gunicorn==19.1.1 +psycopg2==2.5.1 +whitenoise==2.0.6 +static==0.4 From 9e75204cdf0f38b2e44a6b9c82b0261183231e9e Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Thu, 29 Jun 2017 06:09:18 +0530 Subject: [PATCH 02/19] Revert "Revert "Merge master and develop"" --- CODE_OF_CONDUCT.md | 46 ++++ Procfile | 1 + README.md | 2 + oshc/main/static/main/css/.app.css.swp | Bin 12288 -> 0 bytes oshc/main/static/main/css/app.css | 256 +++++++++++++++++---- oshc/main/static/main/images/oshc-logo.png | Bin 9420 -> 4217 bytes oshc/main/static/main/js/script.js | 8 + oshc/main/templates/base.html | 105 +++++---- oshc/main/templates/header.html | 6 +- oshc/main/templates/index.html | 119 ++++++---- requirements.txt | 14 +- 11 files changed, 414 insertions(+), 143 deletions(-) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 Procfile delete mode 100644 oshc/main/static/main/css/.app.css.swp create mode 100644 oshc/main/static/main/js/script.js diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..0281773 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensourcehelpcommunity@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..23294d2 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn --pythonpath oshc oshc.wsgi --log-file - diff --git a/README.md b/README.md index 2e51847..2925473 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,12 @@ We are trying to create a medium where people who want to start with contributin [Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP] +After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch. This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/). Feel free to suggest a better design. +Please submit your pull request on develop branch, it will have the most recent changes. ## Installations Run diff --git a/oshc/main/static/main/css/.app.css.swp b/oshc/main/static/main/css/.app.css.swp deleted file mode 100644 index 831afb69970cbc72947d746c5c0d500042db2fe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 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 diff --git a/oshc/main/static/main/js/script.js b/oshc/main/static/main/js/script.js new file mode 100644 index 0000000..21b83e5 --- /dev/null +++ b/oshc/main/static/main/js/script.js @@ -0,0 +1,8 @@ +$(document).ready(function() { + + $("#toTop").click(function() { + $("html, body").animate({ + scrollTop: 0 + }, 1000); + }); +}); diff --git a/oshc/main/templates/base.html b/oshc/main/templates/base.html index 010331e..ad6b368 100644 --- a/oshc/main/templates/base.html +++ b/oshc/main/templates/base.html @@ -1,49 +1,76 @@ {% load static %} - - - {% include 'header.html' %} - - - {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} + {% include 'header.html' %} + + {% if site.title %}{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}{% endif %} - + -
- -
- -
- {% block content %}{% endblock %} -
- - - +
+ {% block content %}{% endblock %} + {% block footer %} +
+
+
+
+ +
+
+
+
+ © 2017 Open Source Help Community +
+
+
+
+ {% endblock %} +
+ + + diff --git a/oshc/main/templates/header.html b/oshc/main/templates/header.html index 9366ea9..7d7b59f 100644 --- a/oshc/main/templates/header.html +++ b/oshc/main/templates/header.html @@ -1,13 +1,11 @@ {% load static %} - {% if site.author %}{% endif %} {% if site.description %}{% endif %} - - + - + diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 5abd819..9226ea3 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -1,60 +1,79 @@ {% extends 'base.html' %} {% load static %} {% block content %} -
-
- -

Open Source Help Community

-

A Virtual Platform To Help People To Start Contributing To Open Source Projects.

-
-
+
+
+
+ Open Source Help Community Logo +

Open Source Help Community

+

A Virtual Platform To Help People To Start Contributing To Open Source Projects

+
+
+
+
+
+

Our Mission

+

+ "Open Source Help Community is an a virtual platform to help people to start contributing to open source projects" +

+

+ OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects. +

+
+

+ If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com +

+
+
-
+
+
+

Upcoming Sessions

-
+
+
+
+
+

Open Source Contributor's Chat Session with Himanshu Mishra

+
+
+ Himanshu is a pre-final year undergraduate student at IIT Kharagpur. He has been a Google Summer of Code student in 2015 and 2016 and is currently a mentor in Python Software Foundation. +
+ Date: Wed, June 21, 2017 8:30 PM – 9:30 PM IST +
+ +
+
+
+
+

Open Source Contributor's Chat Session with Joannah Nanjekye

+
+
+ Joannah Nanjekye is a software engineer that graduated from Makerere University in Uganda with a Bachelor of Science Degree in software Engineering. +
+ Sat, July 8, 2017 5:30 PM – 6:30 PM IST +
+ +
+
+
-
-

Our Mission

-

Open Source Help Community is an a virtual platform to help people to start contributing to open source projects.

OSHC is established with the idea in mind to reach those people who are interested in contributing to open source projects but find it difficult. OSHC organizes sessions with open source projects contributors and publishes material which will be useful for people to get started with contributing to open source projects.

-

If you would like to share your thoughts or your journey with us, have ideas to make this great, or have questions, please get in touch at opensourcehelpcommunity@gmail.com.

-

Recent Tweets

- +
+
- -
- -
-

Upcoming Sessions -

- - -
- - - - -
- - -
-
-
-

© 2017 OSHC

-
-
- - - -
-
-

Back to top

-
- -
- - -
-
{% endblock %} diff --git a/requirements.txt b/requirements.txt index 6405be5..89d5bdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,4 @@ -Django==1.7.6 -South==1.0.1 -argparse==1.2.1 -wsgiref==0.1.2 -dj-database-url==0.3.0 -dj-static==0.0.6 -gunicorn==19.1.1 -psycopg2==2.5.1 -whitenoise==2.0.6 -static==0.4 +Django==1.11.2 +gunicorn==19.7.1 +pytz==2017.2 +whitenoise==3.3.0 From 9b3bae2a41179b4de6243f468958f376e2ad9763 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Thu, 29 Jun 2017 07:00:06 +0530 Subject: [PATCH 03/19] For test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2925473..b369180 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,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/) After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch. From 2b20af579d1e9f8eb9f2d585ce6bf5376ef6a02b Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Thu, 6 Jul 2017 07:01:50 +0530 Subject: [PATCH 04/19] Empty commit to trigger build again From cffd158832f7c6d6729750bcf4aee139f7ad90d7 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Thu, 6 Jul 2017 21:33:04 +0530 Subject: [PATCH 05/19] Dummy commit to trigger build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b369180..53a9dc0 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ After every commit, the `develop` branch on github is automatically deployed to This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/). Feel free to suggest a better design. + Please submit your pull request on develop branch, it will have the most recent changes. ## Installations From 8a271520339b77f437d548b3db611fa3a3ca9add Mon Sep 17 00:00:00 2001 From: pirate Date: Fri, 7 Jul 2017 22:41:38 -0700 Subject: [PATCH 06/19] Added ADMINS to settings.py --- oshc/oshc/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py index 8daf95c..fcb7489 100644 --- a/oshc/oshc/settings.py +++ b/oshc/oshc/settings.py @@ -24,6 +24,9 @@ ALLOWED_HOSTS = ['*'] +# Tuple of people who get error notifications +ADMINS = [('Tapasweni Pathak','tapaswenipathak@gmail.com'),('Nikhita Raghunath','nikitaraghunath@gmail.com'),('Ibrahim Jarif','jarifibrahim@gmail.com')] + # Application definition From dd1fcf0667b8ccb4094d6072643393b585aabd8c Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Sat, 8 Jul 2017 14:38:02 +0530 Subject: [PATCH 07/19] Remove completed session --- oshc/main/templates/index.html | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 9226ea3..e0ff89e 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -33,20 +33,6 @@

Upcoming Sessions

-
-
-

Open Source Contributor's Chat Session with Himanshu Mishra

-
-
- Himanshu is a pre-final year undergraduate student at IIT Kharagpur. He has been a Google Summer of Code student in 2015 and 2016 and is currently a mentor in Python Software Foundation. -
- Date: Wed, June 21, 2017 8:30 PM – 9:30 PM IST -
- -
-

Open Source Contributor's Chat Session with Joannah Nanjekye

From 990e0c56a8421d3434651ac947a34089dd12cdea Mon Sep 17 00:00:00 2001 From: pirate Date: Sat, 8 Jul 2017 19:00:31 -0700 Subject: [PATCH 08/19] Added all ADMINS to settings.py --- oshc/oshc/settings.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py index fcb7489..c6e6126 100644 --- a/oshc/oshc/settings.py +++ b/oshc/oshc/settings.py @@ -25,8 +25,12 @@ ALLOWED_HOSTS = ['*'] # Tuple of people who get error notifications -ADMINS = [('Tapasweni Pathak','tapaswenipathak@gmail.com'),('Nikhita Raghunath','nikitaraghunath@gmail.com'),('Ibrahim Jarif','jarifibrahim@gmail.com')] - +ADMINS = [ + ('Tapasweni Pathak','tapaswenipathak@gmail.com'), + ('Nikhita Raghunath','nikitaraghunath@gmail.com'), + ('Ibrahim Jarif','jarifibrahim@gmail.com'), + ('Amar Prakash Pandey', 'amar.om1994@gmail.com') +] # Application definition From 3b42064d346e956b3f6750f344e5279c6d495cca Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Tue, 18 Jul 2017 19:26:20 +0530 Subject: [PATCH 09/19] Remove Joannah's session details; Add Utkarsh's session details --- oshc/main/templates/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index e0ff89e..ff77662 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -35,15 +35,15 @@

Upcoming Sessions

-

Open Source Contributor's Chat Session with Joannah Nanjekye

+

Open Source Contributors Chat Session with Utkarsh Dixit

- Joannah Nanjekye is a software engineer that graduated from Makerere University in Uganda with a Bachelor of Science Degree in software Engineering. + Utkarsh Dixit is currently studying in 12th class. He started contributing to Opensource last December, during the time of Google Code-In. He was a Wordpress Blogger/Developer before that. He is the Grand Prize winner of Google Code-In 2016 and is interested in mentoring the same this year. Currently he is contributing to Drupal and Oppia. He is also maintaining previous year GSoC project of Drupal (SOCIAL API)!
Sat, July 8, 2017 5:30 PM – 6:30 PM IST
From eece9d00dd14b9858dfccf539b704088b6361e59 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Wed, 19 Jul 2017 19:57:21 +0530 Subject: [PATCH 10/19] Update date --- oshc/main/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index ff77662..1af5c43 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -40,7 +40,7 @@

Open Source Contributors Chat Session with Utkarsh Dixit
Utkarsh Dixit is currently studying in 12th class. He started contributing to Opensource last December, during the time of Google Code-In. He was a Wordpress Blogger/Developer before that. He is the Grand Prize winner of Google Code-In 2016 and is interested in mentoring the same this year. Currently he is contributing to Drupal and Oppia. He is also maintaining previous year GSoC project of Drupal (SOCIAL API)!
- Sat, July 8, 2017 5:30 PM – 6:30 PM IST + Sat, July 22, 2017 8:00 PM – 9:00 PM IST

From fc43dee0580030466b238307761eee49f742fad1 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Sat, 23 Sep 2017 12:00:57 +0530 Subject: [PATCH 12/19] Add hyperlinks in Mansimar's session details --- oshc/main/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 857bb82..9e050af 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -38,9 +38,9 @@

Upcoming Sessions

Open Source Contributors Chat Session with Mansimar Kaur

- Mansimar Kaur contributed to Brew during Google Summer of Code 2017. Having worked with Mozilla to develop a PubSub channels based Push Service as an Outreachy intern, she has delivered talks about her work at FOSDEM 2017 and Europython 2017. She has also contributed to Kinto and Adobe brackets. + Mansimar Kaur contributed to Brew during Google Summer of Code 2017. Having worked with Mozilla to develop a PubSub channels based Push Service as an Outreachy intern, she has delivered talks about her work at FOSDEM 2017 and Europython 2017.
- Sat, September 26, 2017 7:00 PM – 8:00 PM IST + Tue, September 26, 2017 7:00 PM – 8:00 PM IST
From 75e5b88f41ca0c4639ec2e63c1950d98641eb23a Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Sat, 14 Oct 2017 12:26:57 +0530 Subject: [PATCH 14/19] Correct year --- oshc/main/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 672b859..c656d88 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -38,7 +38,7 @@

Upcoming Sessions

Open Source Contributors Chat Session with Ranveer Aggarwal

- Ranveer is a Software Engineer working with Microsoft. He has contributed to KDE as a Season of KDE 2014 and Google Summer of Code 2016 participant. He has also contributed to DIPY (Python Software Foundation) on a SciFi UI using Python-VTK during Google Summer of Code 2016. Profession aside, he code as a hobby and frequently hack on something (new or old). He is deeply interested in the field of Visual Computing (Computer Graphics, Image Processing, etc.) and most of his projects are centered around these areas. He graduated with a bachelor's in Computer Science and Engineering in 2016. + Ranveer is a Software Engineer working with Microsoft. He has contributed to KDE as a Season of KDE 2014 and Google Summer of Code 2015 participant. He has also contributed to DIPY (Python Software Foundation) on a SciFi UI using Python-VTK during Google Summer of Code 2016. Profession aside, he code as a hobby and frequently hack on something (new or old). He is deeply interested in the field of Visual Computing (Computer Graphics, Image Processing, etc.) and most of his projects are centered around these areas. He graduated with a bachelor's in Computer Science and Engineering in 2016.
Saturday, October 28, 2017 8:00 PM – 9:00 PM IST
From bdebb4a37240f052c08a916299695b03a335e26a Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Mon, 16 Oct 2017 06:31:11 +0530 Subject: [PATCH 15/19] Fix travis failure, update settings.DATABASES --- oshc/oshc/settings.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py index 982ca99..5380ad6 100644 --- a/oshc/oshc/settings.py +++ b/oshc/oshc/settings.py @@ -11,6 +11,7 @@ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os import dj_database_url + BASE_DIR = os.path.dirname(os.path.dirname(__file__)) # Quick-start development settings - unsuitable for production @@ -22,8 +23,6 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.getenv("DEBUG", False) -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') - ALLOWED_HOSTS = ['*'] # Tuple of people who get error notifications @@ -76,7 +75,15 @@ }, ] -DATABASES = { 'default': dj_database_url.config() } +# Database +# https://docs.djangoproject.com/en/1.7/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} # Get DATABASE_URL environment variable and update default DATABASE settings # This setting is required for Heroku @@ -111,8 +118,3 @@ STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'main/'), ) - -try: - from local_settings import * -except ImportError: - pass From 08b0bed0a68c3e972cf8c6f5b1becd409ee12452 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Mon, 16 Oct 2017 06:49:13 +0530 Subject: [PATCH 16/19] Predev merge (#138) Few order changes to keep in sync with predev From 075f32b50fcfbcd5310409ce905b040e6748c7be Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Sun, 24 Dec 2017 12:08:29 +0530 Subject: [PATCH 17/19] Hide signin/signup in production --- oshc/main/templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@
  • Journey
  • Contact
  • Join Us!
    • - {% if user.is_authenticated %} +
    From 261fc786ed5bed987fbc9fb8ad701471d7973acd Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Sun, 24 Dec 2017 12:26:10 +0530 Subject: [PATCH 18/19] Fix main page ui issues --- oshc/main/templates/index.html | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/oshc/main/templates/index.html b/oshc/main/templates/index.html index 70fc3d4..5c7d577 100644 --- a/oshc/main/templates/index.html +++ b/oshc/main/templates/index.html @@ -32,19 +32,6 @@

    Our Mission

    Upcoming Sessions

    -
    -
    -
    -
    -

    Open Source Contributors Chat Session with Ranveer Aggarwal

    -
    -
    - Ranveer is a Software Engineer working with Microsoft. He has contributed to KDE as a Season of KDE 2014 and Google Summer of Code 2015 participant. He has also contributed to DIPY (Python Software Foundation) on a SciFi UI using Python-VTK during Google Summer of Code 2016. Profession aside, he code as a hobby and frequently hack on something (new or old). He is deeply interested in the field of Visual Computing (Computer Graphics, Image Processing, etc.) and most of his projects are centered around these areas. He graduated with a bachelor's in Computer Science and Engineering in 2016. -
    - Saturday, October 28, 2017 8:00 PM – 9:00 PM IST -
    -