![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: fe0000fc597cdca99eb9c52b224a4b1976d31d69
https://github.com/dreamwidth/dw-free/commit/fe0000fc597cdca99eb9c52b224a4b1976d31d69
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-07-15 (Wed, 15 Jul 2015)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Logic/ProfilePage.pm
A htdocs/img/profile_icons/github.png
M htdocs/manage/profile/index.bml
M htdocs/manage/profile/index.bml.text
M htdocs/profile.bml.text
Log Message:
-----------
Add GitHub to user profile page
Allow users to specify their GitHub account credentials on their user
page. This includes both configuring a GitHub username on the edit
profile page, and displaying the username on the user profile page, as
well as adding the necessary database field.
For the sake of being explicit about copyright and trademarks (although
IANAL etc etc), the "octocat" image `github.png` is resized from an
image downloaded from <https://github.com/logos>. Quoting that page at
time of writing:
> GITHUB®, the GITHUB® logo design, OCTOCAT® and the OCTOCAT® logo
> design are exclusive trademarks registered in the United States by
> GitHub, Inc.
>
> The OCTOCAT design is the exclusive property of GitHub, Inc and has
> been federally registered with the United States Copyright Office. All
> rights reserved.
>
> No adaptation or use of any kind of any of our registered trademarks
> or copyrights, or any other contents of this website, is allowed
> without the express written permission of GitHub, Inc.
That page also specifies that one can:
> Do these awesome things
>
> - Use the Octocat or GitHub logo to link to GitHub
>
> - Use the Mark [i.e. the circled octocat silhouette] in social buttons
> to link to your GitHub profile or project
So I think that counts for the "express written permission" required.
Commit: 8d4f2e6f3eeb1114f944d594c42bfd77a603ce46
https://github.com/dreamwidth/dw-free/commit/8d4f2e6f3eeb1114f944d594c42bfd77a603ce46
Author: Jen <jsmgriffin@gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Logic/ProfilePage.pm
A htdocs/img/profile_icons/github.png
M htdocs/manage/profile/index.bml
M htdocs/manage/profile/index.bml.text
M htdocs/profile.bml.text
Log Message:
-----------
Merge pull request #1491 from me-and/other-accounts-github
Add GitHub to user profile page
Compare: https://github.com/dreamwidth/dw-free/compare/86ac787c8d17...8d4f2e6f3eeb
Home: https://github.com/dreamwidth/dw-free
Commit: fe0000fc597cdca99eb9c52b224a4b1976d31d69
https://github.com/dreamwidth/dw-free/commit/fe0000fc597cdca99eb9c52b224a4b1976d31d69
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-07-15 (Wed, 15 Jul 2015)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Logic/ProfilePage.pm
A htdocs/img/profile_icons/github.png
M htdocs/manage/profile/index.bml
M htdocs/manage/profile/index.bml.text
M htdocs/profile.bml.text
Log Message:
-----------
Add GitHub to user profile page
Allow users to specify their GitHub account credentials on their user
page. This includes both configuring a GitHub username on the edit
profile page, and displaying the username on the user profile page, as
well as adding the necessary database field.
For the sake of being explicit about copyright and trademarks (although
IANAL etc etc), the "octocat" image `github.png` is resized from an
image downloaded from <https://github.com/logos>. Quoting that page at
time of writing:
> GITHUB®, the GITHUB® logo design, OCTOCAT® and the OCTOCAT® logo
> design are exclusive trademarks registered in the United States by
> GitHub, Inc.
>
> The OCTOCAT design is the exclusive property of GitHub, Inc and has
> been federally registered with the United States Copyright Office. All
> rights reserved.
>
> No adaptation or use of any kind of any of our registered trademarks
> or copyrights, or any other contents of this website, is allowed
> without the express written permission of GitHub, Inc.
That page also specifies that one can:
> Do these awesome things
>
> - Use the Octocat or GitHub logo to link to GitHub
>
> - Use the Mark [i.e. the circled octocat silhouette] in social buttons
> to link to your GitHub profile or project
So I think that counts for the "express written permission" required.
Commit: 8d4f2e6f3eeb1114f944d594c42bfd77a603ce46
https://github.com/dreamwidth/dw-free/commit/8d4f2e6f3eeb1114f944d594c42bfd77a603ce46
Author: Jen <jsmgriffin@gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Logic/ProfilePage.pm
A htdocs/img/profile_icons/github.png
M htdocs/manage/profile/index.bml
M htdocs/manage/profile/index.bml.text
M htdocs/profile.bml.text
Log Message:
-----------
Merge pull request #1491 from me-and/other-accounts-github
Add GitHub to user profile page
Compare: https://github.com/dreamwidth/dw-free/compare/86ac787c8d17...8d4f2e6f3eeb