Skip to content
This repository has been archived by the owner. It is now read-only.

Link venmo #1857

Merged
merged 30 commits into from Jan 10, 2014
Merged

Link venmo #1857

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ba597f6
Began adding account linking with Venmo
Jan 7, 2014
ff9ab95
Add venmo api keys for dev, began associate
Jan 7, 2014
dcb34fd
typo
Jan 7, 2014
f167db9
WIP connecting venmo
simon-weber Jan 7, 2014
c3f780b
Save venmo information to db, including oauth
Jan 7, 2014
880663d
Refactor confirm
Jan 7, 2014
8df9b9c
create platform -> class registry for AccountElsewhere
simon-weber Jan 7, 2014
2d6bc4b
leave registry interface as dictionary
simon-weber Jan 7, 2014
3ed0f6e
wip refactor
Jan 7, 2014
6359aea
remove username helpers comment
simon-weber Jan 8, 2014
fbdb2ac
Merge branch 'D-refactor-platforms' into link-venmo
simon-weber Jan 8, 2014
e475555
Merge branch 'refactor-platforms' into link-venmo
simon-weber Jan 8, 2014
2a677c6
Merge branch 'master' into link-venmo
simon-weber Jan 8, 2014
32b7d70
Update/organize default env files
Jan 8, 2014
2d7ee98
use requests.json rather than json.loads
simon-weber Jan 8, 2014
277ca54
DRYer AccountElsewhere
Jan 8, 2014
b763a21
WIP link
Jan 8, 2014
ff7298e
note platform_classes requirement
simon-weber Jan 8, 2014
bcdaa14
Merge branch 'link-venmo' of github.com:venmo/www.gittip.com into lin…
simon-weber Jan 8, 2014
8f5915f
resolve platform_classes ordering
simon-weber Jan 8, 2014
c0029ac
prevent data leakage in %username/public.json
simon-weber Jan 9, 2014
427ae5e
ensure platform_classes is populated at config-time
simon-weber Jan 9, 2014
cac31ca
use platform_classes in configure-aspen
simon-weber Jan 9, 2014
2897cad
Merge branch 'master' into link-venmo
Jan 9, 2014
30988e8
Add openstreetmap to list of accounts
Jan 9, 2014
5262b2c
remove debug line from associate view
Jan 9, 2014
257647a
wrap schema changes in transaction
simon-weber Jan 10, 2014
8a8cffa
remove duplicated ProblemChangingUsername exception
simon-weber Jan 10, 2014
9780f0b
Merge upstream
simon-weber Jan 10, 2014
1d2ce2f
remove unused platforms_ordered import
simon-weber Jan 10, 2014
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Merge branch 'master' into link-venmo

Conflicts:
	gittip/elsewhere/__init__.py
	gittip/models/participant.py
	www/%username/username.json.spt
  • Loading branch information...
simon-weber committed Jan 8, 2014
commit 2a677c608ace04127263b591785ed97f28514d36
@@ -6,7 +6,8 @@
from psycopg2 import IntegrityError

import gittip
from gittip.utils.username import reserve_a_random_username, ProblemChangingUsername
from gittip.utils.username import reserve_a_random_username
from gittip.exceptions import ProblemChangingUsername


ACTIONS = [u'opt-in', u'connect', u'lock', u'unlock']
@@ -689,31 +689,6 @@ def get_age_in_seconds(self):
return out


# Exceptions
# ==========

class UsernameIsEmpty(ProblemChangingUsername):
msg = "You need to provide a username!"

class UsernameTooLong(ProblemChangingUsername):
msg = "The username '{}' is too long."

# Not passing the potentially unicode characters back because of:
# https://github.com/gittip/aspen-python/issues/177
class UsernameContainsInvalidCharacters(ProblemChangingUsername):
msg = "That username contains invalid characters."

class UsernameIsRestricted(ProblemChangingUsername):
msg = "The username '{}' is restricted."

class UsernameAlreadyTaken(ProblemChangingUsername):
msg = "The username '{}' is already taken."

class TooGreedy(Exception): pass
class NoSelfTipping(Exception): pass
class BadAmount(Exception): pass


def typecast(request):
"""Given a Request, raise Response or return Participant.
@@ -1,7 +1,6 @@
from aspen import Response, log_dammit
from gittip.exceptions import ProblemChangingUsername
from gittip.models.participant import Participant
from gittip.utils.username import ProblemChangingUsername


[-----------------------------------------------------------------------------]
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.