Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

[WIP] Modular /on/ structure, add Google+ as a provider #802

Closed
wants to merge 3 commits into from
Closed

[WIP] Modular /on/ structure, add Google+ as a provider #802

wants to merge 3 commits into from

Conversation

lyndsysimon
Copy link
Contributor

This is a work in progress. Also, note that I will close this request, rebase, and submit a fresh request as soon as this is ready to implement.

refs: #32, #505

@bjorn
Copy link

bjorn commented Apr 15, 2013

Note that you can force-push to your branch to update the request after rebasing. No need to open a new request for that.

@lyndsysimon
Copy link
Contributor Author

Good point - thanks :)

The fact is, I've been swamped the last couple of weeks getting my affairs in order for a move. I was hoping to get this capped off last week, but that didn't happen, and now it's going to be a while before i can get back to it, unless I just break down and need to code.

@bjorn
Copy link

bjorn commented Apr 15, 2013

Well no rush, but I am looking forward to this feature. No way I can help though, apart from voting you up on https://www.gittip.com/Gittip/ :-)

@lyndsysimon
Copy link
Contributor Author

I'll pick this up again, and either knock it out or help someone else implement it.

@chadwhitacre
Copy link
Contributor

I've brought this work into an elsewhere branch.

@chadwhitacre
Copy link
Contributor

I'm merging master out to elsewhere. Since this is a big merge I'm going to record logs here for reference.

Auto-merging www/version.txt
CONFLICT (content): Merge conflict in www/version.txt
Auto-merging www/security.txt
CONFLICT (content): Merge conflict in www/security.txt
Auto-merging www/index.html
Auto-merging www/credit-card.html
CONFLICT (content): Merge conflict in www/credit-card.html
Auto-merging www/assets/%version/profile.js
Auto-merging www/assets/%version/gittip.js
CONFLICT (content): Merge conflict in www/assets/%version/gittip.js
Auto-merging www/about/charts.html
Auto-merging www/%username/widgets/index.html
Auto-merging www/%username/widget.html
Auto-merging www/%username/toggle-is-suspicious.json
Auto-merging www/%username/tip.json
Auto-merging www/%username/index.html
CONFLICT (content): Merge conflict in www/%username/index.html
Auto-merging www/%username/history/record-an-exchange
Auto-merging www/%username/history/index.html
Auto-merging www/%username/goal.json
Auto-merging www/%username/anonymous.json
Removing www/%participant_id/statement.json
Removing www/%participant_id/public.json
Removing www/%participant_id/participant_id.json
Removing www/%participant_id/giving/index.html
Removing vendor/stripe-1.7.2.tar.gz
Removing vendor/requests-oauth-0.4.1.tar.gz
Removing vendor/requests-0.12.1.tar.gz
Removing vendor/oauthlib-0.1.3.tar.gz
Removing vendor/balanced-0.8.18.tar.gz
Removing vendor/SQLAlchemy-0.7.9.tar.gz
Auto-merging tests/test_username_json.py
Auto-merging tests/test_billing_payday.py
Auto-merging tests/test_billing.py
Removing templates/gittip.scss
Auto-merging schema.sql
CONFLICT (content): Merge conflict in schema.sql
Auto-merging requirements.txt
CONFLICT (modify/delete): package.json deleted in HEAD and modified in master. Version master of package.json left in tree.
Removing makedb.sh
CONFLICT (rename/delete): karma-unit.conf.js deleted in HEAD and renamed in master. Version master of karma-unit.conf.js left in tree.
CONFLICT (rename/delete): karma-e2e.conf.js deleted in HEAD and renamed in master. Version master of karma-e2e.conf.js left in tree.
CONFLICT (modify/delete): jstests/scripts/e2e_runner.py deleted in HEAD and modified in master. Version master of jstests/scripts/e2e_runner.py left in tree.
Removing img-src/gittip.256.png
Auto-merging gittip/wireup.py
CONFLICT (content): Merge conflict in gittip/wireup.py
Auto-merging gittip/utils.py
CONFLICT (content): Merge conflict in gittip/utils.py
Auto-merging gittip/testing/__init__.py
CONFLICT (content): Merge conflict in gittip/testing/__init__.py
Auto-merging gittip/participant.py
CONFLICT (content): Merge conflict in gittip/participant.py
Auto-merging gittip/orm/__init__.py
Auto-merging gittip/models/participant.py
CONFLICT (content): Merge conflict in gittip/models/participant.py
CONFLICT (modify/delete): gittip/fake_data.py deleted in HEAD and modified in master. Version master of gittip/fake_data.py left in tree.
Auto-merging gittip/elsewhere/__init__.py
CONFLICT (content): Merge conflict in gittip/elsewhere/__init__.py
Auto-merging gittip/billing/__init__.py
CONFLICT (content): Merge conflict in gittip/billing/__init__.py
Auto-merging configure-aspen.py
CONFLICT (content): Merge conflict in configure-aspen.py
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

@chadwhitacre
Copy link
Contributor 

$ git status --short
UU .gitignore
M  .travis.yml
UU Makefile
UU README.md
UU configure-aspen.py
M  default_local.env
M  default_tests.env
M  enforce-utc.sql
M  gittip.py
M  gittip/__init__.py
UU gittip/billing/__init__.py
M  gittip/billing/payday.py
M  gittip/cli.py
UU gittip/elsewhere/__init__.py
A  gittip/elsewhere/bitbucket.py
A  gittip/elsewhere/bountysource.py
M  gittip/elsewhere/github.py
M  gittip/elsewhere/twitter.py
DU gittip/fake_data.py
A  gittip/mixpanel.py
M  gittip/models/__init__.py
A  gittip/models/community.py
M  gittip/models/elsewhere.py
M  gittip/models/exchange.py
A  gittip/models/goal.py
A  gittip/models/identification.py
UU gittip/models/participant.py
M  gittip/models/tip.py
M  gittip/models/user.py
M  gittip/orm/__init__.py
UU gittip/participant.py
A  gittip/query_cache.py
UU gittip/testing/__init__.py
M  gittip/testing/client.py
UU gittip/utils.py
UU gittip/wireup.py
A  img-src/gittip-logo-16.png
A  img-src/gittip-logo-24.png
A  img-src/gittip-logo-256.png
A  img-src/gittip-logo-32.png
A  img-src/gittip-logo-64.png
D  img-src/gittip.256.png
DU jstests/scripts/e2e_runner.py
UA karma-e2e.conf.js
UA karma-unit.conf.js
D  makedb.sh
DU package.json
A  recreate-schema.sh
M  release.sh
M  requirements.txt
UU schema.sql
A  scss/buttons-knobs.scss
A  scss/elements.scss
A  scss/fonts-colors-mixins.scss
A  scss/gittip.scss
A  scss/history.scss
A  scss/horn.scss
A  scss/layout.scss
A  scss/modules.scss
A  scss/open-group.scss
A  scss/profile-edit.scss
A  scss/responsiveness.scss
A  scss/utils.scss
M  templates/base.html
M  templates/connected-accounts.html
D  templates/gittip.scss
A  templates/my-tip.html
M  templates/participant.html
A  templates/participant.tip.html
M  templates/profile-edit.html
M  templates/profile.html
A  templates/sign-in-using-to-give.html
A  templates/sign-in-using.html
M  tests/test_billing.py
M  tests/test_billing_payday.py
M  tests/test_elsewhere.py
M  tests/test_elsewhere_github.py
A  tests/test_goal_json.py
M  tests/test_pages.py
M  tests/test_participant.py
M  tests/test_participant_model.py
M  tests/test_public_json.py
M  tests/test_record_an_exchange.py
M  tests/test_user.py
R  tests/test_participant_id_json.py -> tests/test_username_json.py
D  vendor/SQLAlchemy-0.7.9.tar.gz
A  vendor/balanced-0.11.5.tar.gz
D  vendor/balanced-0.8.18.tar.gz
D  vendor/oauthlib-0.1.3.tar.gz
A  vendor/oauthlib-0.4.2.tar.gz
D  vendor/requests-0.12.1.tar.gz
A  vendor/requests-1.2.3.tar.gz
D  vendor/requests-oauth-0.4.1.tar.gz
A  vendor/requests-oauthlib-0.3.2.tar.gz
D  vendor/stripe-1.7.2.tar.gz
A  vendor/stripe-1.9.1.tar.gz
D  www/%participant_id/giving/index.html
D  www/%participant_id/index.html
D  www/%participant_id/participant_id.json
D  www/%participant_id/public.json
D  www/%participant_id/statement.json
R  www/%participant_id/anonymous.json -> www/%username/anonymous.json
A  www/%username/giving/index.html
R  www/%participant_id/goal.json -> www/%username/goal.json
R  www/%participant_id/history/index.html -> www/%username/history/index.html
R  www/%participant_id/history/record-an-exchange -> www/%username/history/record-an-exchange
A  www/%username/horn/index.html
A  www/%username/horn/toot.json
A  www/%username/horn/toots.json
UU www/%username/index.html
A  www/%username/members.json
A  www/%username/public.json
A  www/%username/receipts/%exchange_id.int.html
A  www/%username/split.html
A  www/%username/split.json
A  www/%username/statement.json
R  www/%participant_id/tip.json -> www/%username/tip.json
R  www/%participant_id/toggle-is-suspicious.json -> www/%username/toggle-is-suspicious.json
A  www/%username/username.json
R  www/%participant_id/widget.html -> www/%username/widget.html
R  www/%participant_id/widgets/index.html -> www/%username/widgets/index.html
M  www/about/charts.html
M  www/about/faq.html
M  www/about/fraud/2012-11-05.html
M  www/about/fraud/review.html
M  www/about/index.html
M  www/about/me.html
M  www/about/me/%redirect_to
M  www/about/privacy/index.html
M  www/about/stats
M  www/about/terms/index.html
M  www/about/terms/of-service.html
A  www/about/top.json
M  www/assets/%version/admin.js
M  www/assets/%version/gittip.css
UU www/assets/%version/gittip.js
A  www/assets/%version/gittip/communities.js
A  www/assets/%version/gittip/forms.js
A  www/assets/%version/gittip/horn.js
A  www/assets/%version/gittip/jump.js
A  www/assets/%version/gittip/payments.js
A  www/assets/%version/gittip/tips.js
A  www/assets/%version/open_group.js
M  www/assets/%version/profile.js
A  www/assets/%version/utils.js
A  www/assets/angular.min.js
A  www/assets/bitbucket.png
A  www/assets/bountysource.png
A  www/assets/chosen/chosen-sprite.png
A  www/assets/chosen/[email protected]
A  www/assets/chosen/chosen.css
A  www/assets/chosen/chosen.jquery.min.js
M  www/assets/gittip.opengraph.png
A  www/assets/icons/balanced.12.png
A  www/assets/icons/balanced.16.png
A  www/assets/icons/bitbucket.12.png
A  www/assets/icons/bitbucket.16.png
A  www/assets/icons/bountysource.12.png
A  www/assets/icons/bountysource.16.png
A  www/assets/range-bg.png
M  www/bank-account-complete.html
M  www/bank-account.html
M  www/bank-account.json
UU www/credit-card.html
M  www/credit-card.json
A  www/for/%slug/index.html
A  www/for/communities.json
A  www/for/index.html
A  www/google4adcee99541b0f50.html
M  www/index.html
A  www/lookup.json
A  www/on/bitbucket/%username/index.html
A  www/on/bitbucket/associate
A  www/on/bitbucket/redirect
A  www/on/bountysource/associate
A  www/on/bountysource/failure.html
A  www/on/bountysource/redirect
M  www/on/confirm.html
M  www/on/github/%login/index.html
A  www/on/github/%login/public.json
M  www/on/github/associate
M  www/on/take-over.html
M  www/on/twitter/%screen_name/index.html
M  www/on/twitter/associate
M  www/on/twitter/redirect
M  www/robots.txt
UU www/security.txt
UU www/version.txt

@chadwhitacre
Copy link
Contributor

Per IRC I'm now trying a rebase instead of a merge.

@chadwhitacre
Copy link
Contributor

Yeesh! Okay, I made an elsewhere branch with these commits and rebased it onto master. Pushing, and closing this PR.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lyndsysimon @bjorn @chadwhitacre