eric
|
dda48c1161
|
opinionated rewrite
|
2015-05-08 13:22:25 -04:00 |
Raymond Yee
|
6f87140003
|
Merge pull request #483 from Gluejar/url_from_future
Url from future
|
2015-04-30 11:32:53 -07:00 |
|
Raymond Yee
|
0c91a328be
|
added a notebook I used to check the work for PR 483
|
2015-04-30 11:30:48 -07:00 |
|
eric
|
266378b7ed
|
fix dotted url names
|
2015-04-28 14:13:18 -04:00 |
|
eric
|
877eac1af2
|
stray file?
|
2015-04-27 23:24:19 -04:00 |
|
eric
|
29108128a5
|
global change url syntax
|
2015-04-27 23:24:02 -04:00 |
|
Raymond Yee
|
5bab4906d1
|
Merge pull request #482 from Gluejar/stripe_email_encoding
needed to have unicode to handle non-ascii names in Stripe
|
2015-04-21 08:57:46 -07:00 |
|
Raymond Yee
|
b10f8296ba
|
needed to have unicode to handle non-ascii names in Stripe
|
2015-04-21 08:55:27 -07:00 |
|
Raymond Yee
|
fe6d880957
|
Merge pull request #477 from Gluejar/view_as_plain
View as plain
|
2015-04-17 13:57:47 -07:00 |
|
Raymond Yee
|
f676d116aa
|
Merge pull request #476 from Gluejar/purchase_button
fix exception when no radio
|
2015-04-17 13:36:39 -07:00 |
|
Raymond Yee
|
7f8b0e5d8a
|
Merge pull request #481 from Gluejar/facebook23
Sending this to just now for testing there.
|
2015-04-17 11:17:34 -07:00 |
|
Raymond Yee
|
46574801f7
|
I think now we have a Facebook profile link that works for both the global Facebook user ids and app scoped user ids.
|
2015-04-17 11:15:07 -07:00 |
|
eric
|
43ff601def
|
I was in a hurry
|
2015-04-17 13:00:26 -04:00 |
|
eric
|
bc16323652
|
fix profile link
|
2015-04-17 12:37:44 -04:00 |
|
eric
|
8d53a016f9
|
update facebook picture
|
2015-04-17 11:46:29 -04:00 |
|
Raymond Yee
|
5f5518f0c4
|
Merge pull request #480 from Gluejar/long_fbid
fb id to bigint
|
2015-04-16 20:35:39 -07:00 |
|
eric
|
f340826276
|
fb id to bigint
|
2015-04-16 23:20:29 -04:00 |
|
Raymond Yee
|
7b89d79187
|
Merge pull request #479 from Gluejar/just_fb_credentials
facebook credentials for just
|
2015-04-16 16:00:27 -07:00 |
|
Raymond Yee
|
bc0e753d44
|
facebook credentials for just
|
2015-04-16 15:59:19 -07:00 |
|
Raymond Yee
|
40e69708f1
|
Merge pull request #478 from Gluejar/protect_email
update PSA and dependencies
|
2015-04-16 13:43:37 -07:00 |
|
eric
|
28cebd0868
|
update PSA and dependencies
https://github.com/omab/python-social-auth/commit/74535c687c3373a9f58cd0
e310ed29980200ab91
|
2015-04-16 15:44:02 -04:00 |
|
eric
|
0a0b31d2dd
|
Merge branch 'master' into view_as_plain
|
2015-04-15 22:21:40 -04:00 |
|
Raymond Yee
|
d195c379d6
|
Merge pull request #475 from Gluejar/google_oauth
fix auth pipeline classes
|
2015-04-15 16:02:06 -07:00 |
|
eric
|
f7bfdfbbc4
|
fix exeption when no radio
The exception we've seen is caused by clicking purchase for b2u without
picking a radio button; before gifting there was always a button
checked.
|
2015-04-15 18:31:46 -04:00 |
|
eric
|
7715551671
|
fix auth pipeline classes
|
2015-04-15 10:50:36 -04:00 |
|
eric
|
5644d0ea37
|
add "view_as parameter"
|
2015-04-11 08:25:41 -04:00 |
|
eric
|
f5ebcb7a62
|
Merge branch 'google_oauth' into view_as_plain
|
2015-04-11 08:24:50 -04:00 |
|
Raymond Yee
|
5ec5ccedff
|
Merge pull request #474 from Gluejar/google_oauth
adding facebook keys for just
|
2015-04-10 17:37:24 -07:00 |
|
Raymond Yee
|
66b6a73acd
|
facebook keys for just
|
2015-04-10 17:36:31 -07:00 |
|
Raymond Yee
|
f596d25de5
|
Merge pull request #473 from Gluejar/google_oauth
Google oauth
|
2015-04-10 16:27:32 -07:00 |
|
Raymond Yee
|
b61a4a0e0c
|
1) updated settings/dev.py to reflect new parameters needed for python-social-auth
2) added an IPython notebook to run Selenium test
|
2015-04-10 16:05:12 -07:00 |
|
eric
|
4944df8e78
|
error introduced by a comment
|
2015-04-10 15:10:55 -04:00 |
|
eric
|
6ef8e7699d
|
update credentials
|
2015-04-09 13:28:03 -04:00 |
|
eric
|
dab8954388
|
this is why we have tests
|
2015-04-09 13:12:22 -04:00 |
|
eric
|
97579bda71
|
re-establish un length limit
|
2015-04-09 12:41:00 -04:00 |
|
eric
|
e87294d442
|
twitter and facebook settings
|
2015-04-09 11:44:48 -04:00 |
|
eric
|
db457a948f
|
fixed user menu, bootstrapized learn more
|
2015-04-09 09:21:59 -04:00 |
|
eric
|
9e24dfaf7d
|
change all signin buttons to bootstrap buttons
|
2015-04-08 23:32:36 -04:00 |
|
eric
|
d695769a3c
|
add fontawesome fonts
from https://github.com/FortAwesome/Font-Awesome/tree/v4.3.0
|
2015-04-08 23:31:22 -04:00 |
|
eric
|
8d1f911726
|
add bootstrap mix-ins
from bootstrap v3.3.4
https://github.com/twbs/bootstrap/commit/4127b250db461e47639983e2ad17796
3316386e1
|
2015-04-08 23:28:52 -04:00 |
|
eric
|
a8cab6c0ae
|
get google oauth2 working
|
2015-04-07 22:55:30 -04:00 |
|
Raymond Yee
|
d5291b6f89
|
Merge pull request #454 from Gluejar/mobigen_integrate
Mobigen integrate
|
2015-04-03 10:06:11 -07:00 |
|
Raymond Yee
|
53a37b1b31
|
Merge branch 'master' into mobigen_integrate
|
2015-04-03 10:05:02 -07:00 |
|
Raymond Yee
|
fda236190f
|
Merge pull request #472 from Gluejar/metrics_nits
Metrics nits
|
2015-03-31 12:26:05 -07:00 |
|
eric
|
27af1780ab
|
month summary was including previous year
|
2015-03-31 13:51:22 -04:00 |
|
eric
|
78c2bb2dfc
|
add free count
|
2015-03-31 13:50:39 -04:00 |
|
Raymond Yee
|
4d6fd00b12
|
Merge pull request #471 from Gluejar/fix_ebook_admin
empty filesize was an issue for admin
|
2015-03-24 13:03:58 -07:00 |
|
eric
|
5d87f72e3b
|
empty filesize was an issue for admin
|
2015-03-24 13:13:31 -04:00 |
|
Raymond Yee
|
85d057eb7d
|
Merge pull request #469 from Gluejar/improve_redemption
add case for correct user already has redeemed
|
2015-03-19 10:41:31 -07:00 |
|
Raymond Yee
|
8c7d99c8d7
|
Merge pull request #468 from Gluejar/subject_mapping
add keyword mapping
|
2015-03-19 10:37:05 -07:00 |