From db48f08d94b700253f8c41c6a0172d6424193bf0 Mon Sep 17 00:00:00 2001 From: Gerry Boland Date: Sat, 20 Jun 2015 14:11:42 +0100 Subject: [PATCH 1/6] Remove bad default username & password for the DB --- broadgauge/default_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broadgauge/default_settings.py b/broadgauge/default_settings.py index 622d66b..7ce6863 100644 --- a/broadgauge/default_settings.py +++ b/broadgauge/default_settings.py @@ -17,7 +17,7 @@ google_client_id = '360651067559-f04a4e5scoa0bgau2tar06q05jeg5j2n.apps.googleusercontent.com' google_client_secret = 'CI8Pl4jSmsK5gbFRa9dfio1E' -db_parameters = dict(dbn='postgres', db='pythonexpress', user='gerry', pw='myname1') +db_parameters = dict(dbn='postgres', db='pythonexpress') # MAIL SETTINGS From bb2679db9971c15b4c3041e6b7f4d47b02397769 Mon Sep 17 00:00:00 2001 From: bmihovski Date: Sun, 21 Jun 2015 21:15:24 +0100 Subject: [PATCH 2/6] Issue #13 - about page is edited. --- broadgauge/templates/about.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/broadgauge/templates/about.md b/broadgauge/templates/about.md index 4bf4a45..c13e6fb 100644 --- a/broadgauge/templates/about.md +++ b/broadgauge/templates/about.md @@ -9,15 +9,16 @@ The second motivation was the lessons learned from organizing such an initiative What should you do? ------------------- -Sign up as a trainer on the Python Express website and check the list of colleges that are willing to organize workshops. If you find any of them to be suitable for you to go and teach at, Express Interest in that particular college. Once you are accepted, you will be notified and things can be taken forward from there. +Sign up as a trainer on the Python Express website and check the list of up coming workshops from Workshops tab. If you find any of them are suitable for you and you want to take it, you can select them by workshop name and confirm it from Express Interest button. Once you are accepted, you will be notified and things can be taken forward from there. Sign up as a trainer now: -[/trainers/signup](http://www.pythonexpress.in/trainers/signup) +[http://www.pythonexpress.ie/trainers/signup](http://www.pythonexpress.ie/trainers/signup) -If you are interested in organizing a Python workshop, sign up as an organization/institution on the Python Express website. The trainers who have already signed up will be able to see your institution. If they are interested, they will Express Interest in your institution. Once that happens, you will be able to accept them and take it forward. +If you are interested in organizing a Python workshop, sign up as an organization/institution on the Python Express website. +You can set up a new workshop from your organization space which can be found into Organization tab. The trainers who have already signed up will be able to see all of the upcoming workshops which belong to your institution. If they are interested, they can apply as a trainers. Once that happens, you will be able to accept them and take it forward. Register an organization now: -[/orgs/signup](http://www.pythonexpress.in/orgs/signup) +[http://www.pythonexpress.ie/orgs/signup](http://www.pythonexpress.ie/orgs/signup) Spread the word and let us spread the love of Python far and wide. From d73d2206d40acbd4e3d28ef19d06840fe492525f Mon Sep 17 00:00:00 2001 From: bmihovski Date: Sun, 21 Jun 2015 21:20:52 +0100 Subject: [PATCH 3/6] DB settings are reverted. --- broadgauge/default_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broadgauge/default_settings.py b/broadgauge/default_settings.py index 0e4b5c9..9ee7899 100644 --- a/broadgauge/default_settings.py +++ b/broadgauge/default_settings.py @@ -18,7 +18,7 @@ google_client_id = '483978112071-ps7jdal5tdbtjo0utapi5f3lud75spru.apps.googleusercontent.com' google_client_secret = 'Ld4qdhXnQO-Qzc54tcf51LA6' -db_parameters = dict(dbn='postgres', db='pythonexpress') +db_parameters = dict(dbn='postgres', db='pythonexpress', user='gerry', pw='myname1') # MAIL SETTINGS From ba9119a0328a379dfff03f40b260a49374ba9c93 Mon Sep 17 00:00:00 2001 From: bmihovski Date: Sun, 21 Jun 2015 23:05:09 +0100 Subject: [PATCH 4/6] Issue #13 - about page is edited. --- broadgauge/templates/about.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broadgauge/templates/about.md b/broadgauge/templates/about.md index c13e6fb..266ce3f 100644 --- a/broadgauge/templates/about.md +++ b/broadgauge/templates/about.md @@ -12,13 +12,13 @@ What should you do? Sign up as a trainer on the Python Express website and check the list of up coming workshops from Workshops tab. If you find any of them are suitable for you and you want to take it, you can select them by workshop name and confirm it from Express Interest button. Once you are accepted, you will be notified and things can be taken forward from there. Sign up as a trainer now: -[http://www.pythonexpress.ie/trainers/signup](http://www.pythonexpress.ie/trainers/signup) +[/trainers/signup](/trainers/signup) If you are interested in organizing a Python workshop, sign up as an organization/institution on the Python Express website. You can set up a new workshop from your organization space which can be found into Organization tab. The trainers who have already signed up will be able to see all of the upcoming workshops which belong to your institution. If they are interested, they can apply as a trainers. Once that happens, you will be able to accept them and take it forward. Register an organization now: -[http://www.pythonexpress.ie/orgs/signup](http://www.pythonexpress.ie/orgs/signup) +[/orgs/signup](/orgs/signup) Spread the word and let us spread the love of Python far and wide. From 8a0a550b9c2719a7858f0a2880c4bd1a62206d66 Mon Sep 17 00:00:00 2001 From: bmihovski Date: Sun, 21 Jun 2015 23:14:18 +0100 Subject: [PATCH 5/6] Issue #10 fix - default e-mails are set up. --- broadgauge/default_settings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/broadgauge/default_settings.py b/broadgauge/default_settings.py index 9ee7899..f3a760b 100644 --- a/broadgauge/default_settings.py +++ b/broadgauge/default_settings.py @@ -20,6 +20,11 @@ db_parameters = dict(dbn='postgres', db='pythonexpress', user='gerry', pw='myname1') +# contact form default e-mail +contact_email = "contact@python.ie" +# default admin e-mail +admin_user = "contact@python.ie" + # MAIL SETTINGS # smtp_server = "smtp.googlemail.com" From c7f858a38e3e19346ebd0f7711e968e4db7aacf0 Mon Sep 17 00:00:00 2001 From: bmihovski Date: Mon, 22 Jun 2015 00:12:09 +0100 Subject: [PATCH 6/6] Registration hyperlinks titles improvement. --- broadgauge/templates/about.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broadgauge/templates/about.md b/broadgauge/templates/about.md index 266ce3f..90242d4 100644 --- a/broadgauge/templates/about.md +++ b/broadgauge/templates/about.md @@ -12,13 +12,13 @@ What should you do? Sign up as a trainer on the Python Express website and check the list of up coming workshops from Workshops tab. If you find any of them are suitable for you and you want to take it, you can select them by workshop name and confirm it from Express Interest button. Once you are accepted, you will be notified and things can be taken forward from there. Sign up as a trainer now: -[/trainers/signup](/trainers/signup) +[Trainers Signup](/trainers/signup) If you are interested in organizing a Python workshop, sign up as an organization/institution on the Python Express website. You can set up a new workshop from your organization space which can be found into Organization tab. The trainers who have already signed up will be able to see all of the upcoming workshops which belong to your institution. If they are interested, they can apply as a trainers. Once that happens, you will be able to accept them and take it forward. Register an organization now: -[/orgs/signup](/orgs/signup) +[Organizations Signup](/orgs/signup) Spread the word and let us spread the love of Python far and wide.