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

Update support and community URLs #2746

Merged
merged 4 commits into from
Aug 5, 2020
Merged

Update support and community URLs #2746

merged 4 commits into from
Aug 5, 2020

Conversation

jnm
Copy link
Member

@jnm jnm commented Aug 3, 2020

Description

Quick & Easy 😉

Related issues

Closes #2722
Closes kobotoolbox/tasks#320

'URL for privacy policy'),
'SOURCE_CODE_URL': ('https://github.com/kobotoolbox/',
'URL of source code repository. When empty, a link '
'will not be shown in the user interface'),
'SUPPORT_URL': (os.environ.get('KOBO_SUPPORT_URL',
'http://help.kobotoolbox.org/'),
'https://community.kobotoolbox.org/'),
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't SUPPORT_URL be http://support.kobotoolbox.org? And then add COMMUNITY_URL for https://community.kobotoolbox.org/ :)

Copy link
Member Author

@jnm jnm Aug 3, 2020

Choose a reason for hiding this comment

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

I chose what I did because help.kobotoolbox.org redirects to community.kobotoolbox.org ;)
@tinok, thoughts?

oops, as @magicznyleszek observes, SUPPORT_URL here isn't used yet but will be by #2747, and community.kobotoolbox.org is hard-coded. I'll change SUPPORT_URL to support… and add a new COMMUNITY_URL to this PR and ask for #2747 to be updated

@jnm jnm assigned magicznyleszek and unassigned noliveleger Aug 3, 2020
@jnm jnm removed the request for review from noliveleger August 3, 2020 17:32
@jnm
Copy link
Member Author

jnm commented Aug 3, 2020

@magicznyleszek, I'm giving you this PR 💝
If it looks OK to you, could you also update your #2747 to use community_url from /environment, please?

@jnm jnm changed the title Use Discourse URL for support and https everywhere Use everywhere; update support and community URLs Aug 3, 2020
@jnm jnm changed the title Use everywhere; update support and community URLs Update support and community URLs Aug 3, 2020
@magicznyleszek
Copy link
Member

magicznyleszek commented Aug 5, 2020

@jnm I've updated #2747 to use community_url and to not display privacy policy or terms of service in UI when these are empty 👍 And I guess we should merge these two at the same time?

@jnm
Copy link
Member Author

jnm commented Aug 5, 2020

Sounds good. I'll merge both of them in a moment

@jnm jnm merged commit 18a40d6 into master Aug 5, 2020
@jnm jnm deleted the update-constance-urls branch August 5, 2020 19:29
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.

Remove T&C and privacy URLs from base.py
3 participants