Commit Graph

2738 Commits (38b2567a025526977f8436a17057d58f03997fcc)

Author SHA1 Message Date
Raymond Yee 7ecf4494db Merge branch 'master' into relaunch_ry 2012-09-14 17:04:55 -07:00
Raymond Yee fd1887ea44 [#36028929] Work to pull out relevant fields in stripe Customer and Charge model with goal of figuring out which to add to payment.models.{Account | Transaction} 2012-09-14 17:00:21 -07:00
thatandromeda 503049afee Merge pull request #1 from Gluejar/fix_google_id
the google books id is always the first in our db. changing to the id fo...
2012-09-14 11:58:26 -07:00
eshellman a3390b88bb Merge pull request #2 from Gluejar/fix_wishlist_js
adding functionality erroneously removed, plus updating to use recent jq...[#35857177]
2012-09-14 07:07:17 -07:00
Andromeda Yelton 6a2efa9c68 adding functionality erroneously removed, plus updating to use recent jquery function 2012-09-14 09:21:05 -04:00
Raymond Yee c545173793 First pass at payment.models.Account 2012-09-13 16:43:54 -07:00
Raymond Yee a68cd81823 Merge branch 'master' into relaunch_ry 2012-09-13 15:55:43 -07:00
Raymond Yee c099bfe12c Merge branch 'relaunch_ry' into relaunch 2012-09-13 14:27:33 -07:00
Raymond Yee c5f22742c1 In making a stripe charge, record transaction.type and transaction.approved.
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257) )
2012-09-13 14:12:49 -07:00
eric 270b47ef62 the google books id is always the first in our db. changing to the id for preferred edition [#35918643] 2012-09-13 14:55:46 -04:00
thatandromeda cbd9640287 Update frontend/templates/base.html
better link, now that that blog post exists
2012-09-13 15:42:11 -03:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Raymond Yee b85fbfc78b Merge branch 'master' into relaunch_ry 2012-09-13 10:42:35 -07:00
Raymond Yee eac0e24b1b Small change: now storing amount and status for transaction with new pledge. 2012-09-13 10:39:42 -07:00
Andromeda Yelton 4cd685a61a communicate about lack of active campaigns 2012-09-13 11:22:40 -04:00
Andromeda Yelton 7bd44fb93e link to work page not download page 2012-09-13 11:17:05 -04:00
Andromeda Yelton fdf27c4029 make work title on download page a link 2012-09-13 11:14:32 -04:00
Andromeda Yelton d4309dd46c digital shift coverage of OLA unglued ebook launch 2012-09-12 11:55:27 -04:00
Andromeda Yelton de78548a32 list press releases on press page 2012-09-12 11:31:22 -04:00
Andromeda Yelton fb648bbb5c Merge branch 'fix_lockss' 2012-09-12 10:37:29 -04:00
Andromeda Yelton 18a598f628 need to change lockss page since unglued adheres to editions 2012-09-12 10:11:49 -04:00
Andromeda Yelton 3733780ef3 Merge branch 'master' of github.com:Gluejar/regluit 2012-09-12 10:00:31 -04:00
Andromeda Yelton d8316c76ec user isn't in the context so we shouldn't reference it 2012-09-12 08:41:22 -04:00
eric c457dec497 helpful ebook format notations 2012-09-12 00:20:09 -04:00
eric 64461cc49e one letter typo was messing up unglued ebooks display 2012-09-12 00:09:29 -04:00
Raymond Yee e6f94223f4 Merge branch 'master' into relaunch_ry 2012-09-11 15:55:58 -07:00
Raymond Yee 77ceed03ad Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly 2012-09-11 15:53:39 -07:00
Raymond Yee 2ab1f8c7ea Now creating a charge based on token 2012-09-11 15:17:37 -07:00
Raymond Yee d4729bbac1 Merge branch 'master' into ola_announce 2012-09-11 11:29:49 -07:00
Andromeda Yelton b383c9717d hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger 2012-09-11 14:14:57 -04:00
Andromeda Yelton 5fa34858df download button overlapped with some titles 2012-09-11 14:12:00 -04:00
eric dc94a207cc [start #35862759] fixed bug in handle_wishlist_added 2012-09-11 14:06:46 -04:00
Andromeda Yelton ba6c7165b3 OLA launch announcement 2012-09-11 14:03:33 -04:00
Andromeda Yelton 0773a10d16 streamlining 2012-09-11 13:57:00 -04:00
Raymond Yee 5636637266 Merge branch 'master' into relaunch_ry
Conflicts:
	frontend/views.py
2012-09-11 10:42:49 -07:00
eric 5ddc050ff9 [finished #35857177] fixed missing user wishlist context for bookpanel on supporter page
bug introduced in
https://github.com/Gluejar/regluit/commit/fd44471aaecc08c30dd1688b060cd1
18174d910e
2012-09-11 13:41:53 -04:00
eric 2df3047dc0 display all editions for staff 2012-09-10 23:51:22 -04:00
eric e5804a4d4d please use spaces, not tabs to indent 2012-09-10 23:47:06 -04:00
Raymond Yee c4494de34c Merge branch 'relaunch_ry' into relaunch 2012-09-10 17:07:51 -07:00
Raymond Yee a161b1f28b integrating Credit card form in 2012-09-10 17:02:34 -07:00
Raymond Yee 35e399553f restore CCForm 2012-09-10 16:47:36 -07:00
Raymond Yee a2040dfe90 had to fix a conflict I missed in core/signals.py 2012-09-10 14:31:21 -07:00
Raymond Yee 7f344c0ca9 dealing with merge conflicts 2012-09-10 14:27:14 -07:00
Raymond Yee deee2ab75a Merge branch 'master' into relaunch
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:25:43 -07:00
Raymond Yee 0e1839d531 Merge branch 'master' into relaunch_ry
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:18:30 -07:00
Raymond Yee bcceaa719b integrating stripe into fund_the_pledge 2012-09-10 13:17:30 -07:00
Andromeda Yelton 7f6b149773 Merge branch 'master' of github.com:Gluejar/regluit 2012-09-10 15:23:25 -04:00
Andromeda Yelton 7398fdf161 unglued property should adhere to editions, not ebooks 2012-09-10 15:18:40 -04:00
Andromeda Yelton 3a0d09db33 edition-adding on rights tab was hard to read with multiple editions 2012-09-10 14:37:37 -04:00
Raymond Yee e0bc5ee996 Merge branch 'master' into relaunch 2012-09-10 08:52:23 -07:00