Commit Graph

2485 Commits (6d6c324a82788ea06682f7a39d36735e9f150f5f)

Author SHA1 Message Date
thatandromeda b691c8f896 Update frontend/templates/notification/notice_template.html 2012-07-24 14:52:39 -03:00
eric 0d8604e1bd to be safe, removed the word "donation" from website 2012-07-24 10:45:49 -04:00
Andromeda Yelton 6d4044bcde intermediate state 2012-07-24 08:08:34 -04:00
Raymond Yee abd07ec9ae a bit more documentation on how the OLA premiums break down 2012-07-23 09:40:43 -07:00
Raymond Yee ac845b0f06 Merge branch 'master' into ola_fulfill 2012-07-23 07:23:35 -07:00
Raymond Yee 0c0b807385 Adjusting number of editions required from at least 20 to at least 15 for test to pass (latest count 18) 2012-07-23 07:22:14 -07:00
Andromeda Yelton 5855593c5b adding support for acknowledgement fields throughout data pipeline 2012-07-23 08:31:57 -04:00
Andromeda Yelton ef005bbef1 added fields for supporter acknowledgement to class Transaction 2012-07-23 08:12:40 -04:00
Andromeda Yelton 3de4c40647 pledge page shows only custom premiums in main list 2012-07-23 07:43:21 -04:00
Andromeda Yelton fd5e73ea9b don't need adwords code for oral lit any more 2012-07-23 07:41:56 -04:00
Andromeda Yelton c4a96a5d34 work page will now display only custom premiums 2012-07-23 07:41:20 -04:00
eric ed12a0d460 [#32290103] fixed html error- <hr /> not allowed in span 2012-07-22 14:53:53 -04:00
eric 3044507e2b {#22431977] tweaked wording on unglued header 2012-07-22 14:18:29 -04:00
eric fdce89d17b Added language filtering [finish #24232285] 2012-07-21 16:26:16 -04:00
Raymond Yee 685cc36234 Now printing out a lot of info for each supporter 2012-07-20 18:45:11 -07:00
eric 9ff530f69b Merge branch 'master' of https://github.com/Gluejar/regluit 2012-07-20 19:55:58 -04:00
eric d7638463b1 reporting facility for languages 2012-07-20 14:29:04 -04:00
eric eaa69612e2 custom template filter to help language display 2012-07-20 14:28:31 -04:00
Raymond Yee 08e18bbcd3 Merge branch 'master' into ola_fulfill 2012-07-20 10:18:24 -07:00
Raymond Yee 6c7e9594c0 [#33125113] Marking the language test for Cat's Eye as expected failure because I think Google has bad data for this work.
Worth looking at other books
2012-07-20 09:28:14 -07:00
Raymond Yee 9a985176bc Fixed problems in tests stemming from an edition of Neuromancer no longer in Google Books -- switched to another one
We still have issues about language of editions for Cat's Cradle
2012-07-20 08:40:11 -07:00
Raymond Yee 0765e6801d Now working on breaking down specific material and acknowledgement premiums for OLA 2012-07-19 16:06:28 -07:00
Raymond Yee 172e77bb6f First draft of a management command to hlep prototype how we are going to gather premium choices for OLA 2012-07-19 11:02:39 -07:00
Andromeda Yelton 6a6ee190e4 Merge branch 'master' of github.com:Gluejar/regluit 2012-07-18 15:15:31 -04:00
Andromeda Yelton c47f9326f6 erroneously referred to learn_more.css rather than learnmore.css 2012-07-18 15:14:48 -04:00
Andromeda Yelton ac72d2a4c7 addressing IE8 bug with feedback button, I hope 2012-07-18 15:10:29 -04:00
Raymond Yee 167bd8a4c1 Fixing a situation in which there is an error in the pledge view 2012-07-18 11:09:48 -07:00
Raymond Yee f7e49edfcb Continuing work on collecting info for OLA pledges 2012-07-18 10:49:25 -07:00
Andromeda Yelton ce8a36580a whoops, mixed up some attributions 2012-07-18 07:51:30 -04:00
Raymond Yee b8f9155789 Merge branch 'master' of github.com:Gluejar/regluit 2012-07-17 09:24:27 -07:00
Andromeda Yelton 97c2d0b63d need to make sure base.html About link in header works with new expand_about.js 2012-07-17 12:17:43 -04:00
Andromeda Yelton f57ac97e81 die zeit, german NPR coverage 2012-07-17 09:04:10 -04:00
Andromeda Yelton c9871b29a2 Merge branch 'wishlist_tabs'
Conflicts:
	frontend/templates/base.html
2012-07-17 08:53:28 -04:00
Andromeda Yelton f32cb39d9a added conditionals to make sure phrasing made sense for empty wishlists, and clarified who chooses the ungluing fee 2012-07-17 08:47:53 -04:00
Raymond Yee ba6762e781 Merge branch 'master' of github.com:Gluejar/regluit 2012-07-16 11:56:13 -07:00
Andromeda Yelton 362a4d2b85 Merge branch 'master' of github.com:Gluejar/regluit 2012-07-16 14:52:38 -04:00
Raymond Yee d5056441e8 oops...forgot to commit pledge_recharge.html 2012-07-16 11:48:10 -07:00
Andromeda Yelton abdb4ddfc7 adding separator between headline and notification text 2012-07-16 14:46:45 -04:00
Andromeda Yelton c9d57bb08b making the sharing block work 2012-07-16 13:47:18 -04:00
Andromeda Yelton f000c01267 fixing more syntax after testing 2012-07-16 13:29:20 -04:00
Andromeda Yelton f56b342b00 fixing syntax errors found while testing 2012-07-16 12:44:27 -04:00
Andromeda Yelton a226669109 bleah, django-notification fails around the with tags. removed. 2012-07-16 11:50:31 -04:00
eric cf3351d84b Merge branch 'master' of https://github.com/Gluejar/regluit 2012-07-15 16:58:52 -04:00
Raymond Yee 8b3ccf298c revert back to old google books key on jenkins to see whether errors will go down in number 2012-07-13 17:18:29 -07:00
Raymond Yee 1e49732693 almost ready to send this out to supporters with failed pledges 2012-07-13 15:55:41 -07:00
Raymond Yee de415480ae first pass at calculating transactions that need to be recharged
modification to fabfile to download a file of emails
2012-07-13 10:17:51 -07:00
Raymond Yee da1386d7ab Merge branch 'master' into ola_fulfill 2012-07-12 06:16:40 -07:00
eric d72e905628 Revert "seeinggoogle account limits are the problem"
This reverts commit 1551be38bf.
2012-07-12 09:03:58 -04:00
Raymond Yee 7353731db5 4 campaigns now 2012-07-11 21:39:21 -07:00
Raymond Yee 1097c7891b verify signature for amazon payment return 2012-07-11 21:27:24 -07:00