Raymond Yee
|
43162c0406
|
On second thoughts, let's just try the sandbox first on unglue.it, then clear the transactions and the turn on the real money....
|
2012-05-12 08:10:31 -07:00 |
|
Raymond Yee
|
50d6998a92
|
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
|
2012-05-12 08:06:51 -07:00 |
|
Raymond Yee
|
9378f91777
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-12 07:37:26 -07:00 |
eric
|
76b8b9f33d
|
[#29488053] no use linking to google books if no google books id
|
2012-05-11 22:46:41 -04:00 |
|
eric
|
a30976373f
|
better default cover for works with no google id [#29488053]
|
2012-05-11 22:46:03 -04:00 |
|
Raymond Yee
|
10db4d0e60
|
a fab command for pushing keys to ry-dev
corrected a typo in payment/manager.py
|
2012-05-11 18:54:21 -07:00 |
|
eric
|
feb8650c10
|
[#29488053] add to wishlist now works for works without googlebooks_id
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
5bd3f06903
|
[#28851641] removed some debug code
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
ca2bfedafd
|
[#28851641] fillied in you_have_pledged templates
|
2012-05-11 21:29:03 -04:00 |
|
Raymond Yee
|
4ca6a91d7a
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-11 15:15:19 -07:00 |
|
Raymond Yee
|
2590c5d58d
|
Trying to get production to line up with master
|
2012-05-11 15:05:40 -07:00 |
|
Raymond Yee
|
1b16603056
|
Merge branch 'production' of github.com:Gluejar/regluit into production
|
2012-05-11 15:05:18 -07:00 |
|
Raymond Yee
|
fe34207328
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-11 14:15:39 -07:00 |
|
Raymond Yee
|
fbd58d5e4e
|
Add import of notification
|
2012-05-11 14:14:49 -07:00 |
|
Raymond Yee
|
ba36838dfa
|
must import notification
|
2012-05-11 14:03:28 -07:00 |
|
Raymond Yee
|
7c49427e2c
|
Revert "wired pledge_you_have_pledged [#27785469]"
This reverts commit 17d641cf65.
|
2012-05-11 14:00:17 -07:00 |
Jason
|
7d4ec00382
|
Adding public key for jason kace to repository
|
2012-05-11 16:38:49 -04:00 |
|
eric
|
17d641cf65
|
wired pledge_you_have_pledged [#27785469]
|
2012-05-11 15:53:46 -04:00 |
|
Raymond Yee
|
100ed72e0e
|
starter for a method to update local keys
|
2012-05-11 12:40:57 -07:00 |
|
eric
|
36edf0a261
|
[#28851641] // was getting rewritten by apache, I think
|
2012-05-11 15:39:26 -04:00 |
|
Raymond Yee
|
888fa093dd
|
Merge branch 'ry'
|
2012-05-11 12:15:08 -07:00 |
thatandromeda
|
328cea6cf3
|
Update frontend/templates/notification/wishlist_active/full.txt
|
2012-05-11 16:05:47 -03:00 |
|
Raymond Yee
|
7b5c2feb35
|
Added logging on whether loading of FPS keys successful
|
2012-05-11 11:14:43 -07:00 |
|
eric
|
81d158f505
|
[#28851641] Edition creation and editing !!! Needs a schema migration.
|
2012-05-11 14:13:09 -04:00 |
|
eric
|
0f1bfaebc4
|
[finish #29411521] added site to url
|
2012-05-10 17:13:09 -04:00 |
|
eric
|
0ffd89e072
|
eric's public key
|
2012-05-10 16:36:16 -04:00 |
|
Raymond Yee
|
ccf753794c
|
Renaming AY's key to have her name
|
2012-05-10 13:23:10 -07:00 |
|
Andromeda Yelton
|
bc3045161c
|
clarified wording
|
2012-05-10 15:40:37 -04:00 |
|
Andromeda Yelton
|
57b519c2d1
|
committing public key
|
2012-05-10 15:40:14 -04:00 |
|
Andromeda Yelton
|
718286be39
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-10 13:34:57 -04:00 |
|
Andromeda Yelton
|
71c174d012
|
need to expose paypal address field after all
|
2012-05-10 13:23:42 -04:00 |
|
Andromeda Yelton
|
4ba688dbad
|
minor fixes
|
2012-05-10 13:23:19 -04:00 |
|
Raymond Yee
|
1633b5a32d
|
Make it easier to flip the switch on whether to run the FPS sandbox or the real thing
|
2012-05-10 09:03:10 -07:00 |
|
Raymond Yee
|
33642190cb
|
Allows set_key command to set keys that already exists
|
2012-05-10 08:34:45 -07:00 |
|
Raymond Yee
|
9aa586181e
|
Wrapping the import of FPS keys in amazon.py so that things won't die if it gets imported before the database gets set up -- these changes don't break amazon functionality on ry's laptop and hopefully will be ok for jenkins.
|
2012-05-10 08:08:58 -07:00 |
|
Raymond Yee
|
069342276b
|
Merge branch 'ry'
|
2012-05-09 18:04:56 -07:00 |
|
Raymond Yee
|
fe1894c378
|
Add a fab command to set_key -- and also generalize fab destinations because I now have settings/me.py point to the correct local configuration file
|
2012-05-09 18:02:59 -07:00 |
|
Raymond Yee
|
16bb539931
|
Put please into paypay mode
|
2012-05-10 00:50:31 +00:00 |
|
Raymond Yee
|
40a660e9b6
|
Add a set_key django admin command to make it easier to load keys
|
2012-05-09 17:17:18 -07:00 |
|
Raymond Yee
|
090d36de66
|
[#29272807] implemented storage of FPS_* keys in the db
|
2012-05-09 17:16:49 -07:00 |
|
Andromeda Yelton
|
c6186c7808
|
need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want
|
2012-05-09 16:33:22 -04:00 |
|
Andromeda Yelton
|
fe84c09651
|
polishing for launch
|
2012-05-09 16:32:06 -04:00 |
|
Raymond Yee
|
4deae23fd4
|
Ooops -- I forgot one migration
|
2012-05-09 11:42:29 -07:00 |
|
Raymond Yee
|
71bd2a88c9
|
Had to fix campaign_starter.sql so that the migration to create core.models.Key doesn't fail
|
2012-05-09 11:36:13 -07:00 |
|
Andromeda Yelton
|
41f662c048
|
updating pledging contextual FAQs
|
2012-05-09 13:40:01 -04:00 |
|
Andromeda Yelton
|
d0bac11ec4
|
clarifing CC noncommercial
|
2012-05-09 13:26:12 -04:00 |
|
Andromeda Yelton
|
e1835a7cc7
|
updating, including amazon and paypal language
|
2012-05-09 13:01:17 -04:00 |
|
Andromeda Yelton
|
e4e66b2118
|
adding some more recent coverage
|
2012-05-09 12:45:00 -04:00 |
|
Raymond Yee
|
194298cdef
|
Adjusted selenium test for latest UI change
|
2012-05-09 09:42:59 -07:00 |
|
Andromeda Yelton
|
42d33794e3
|
sign up element in learn more section was misaligned
|
2012-05-09 12:20:41 -04:00 |