EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,683 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

1048 Commits (d1941de032e0cbed7295d548fc41742234cb2df4)

Author SHA1 Message Date
Andromeda Yelton 3a1a523acb typo 2012-09-10 10:51:43 -04:00
eric 92a2ccc7ce cleaned up the response when a pledge is modified rather than created 2012-09-07 17:48:48 -04:00
eric 4700e63b06 resolve conflict 2012-09-07 16:26:09 -04:00
eric 18608d3e7d preapproval amount is now amount for requested premium, not previously pledged amount 2012-09-07 16:13:53 -04:00
eric a361d7b53d so we didn't really need to put premium description directly into context 2012-09-07 16:12:32 -04:00
Raymond Yee 1742572d95 Merge branch 'master' into relaunch 
Conflicts:
	frontend/views.py
 2012-09-07 13:08:03 -07:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
eric c2636f5bba removed legacy DonateView 2012-09-07 01:11:28 -04:00
eric 4d4e61d338 donation modification now works [#21784207] 2012-09-06 16:55:32 -04:00
eric bd794a2ac5 clean up the donation endpoint pages so they work (if a bit ugly!) 2012-09-06 14:04:47 -04:00
eric 9395cd058b now donating cents works, too 2012-09-06 11:36:13 -04:00
eric 8eeadc99d3 woo hoo, credit and donation scaffolding works end to end [#21784207] 2012-09-06 01:01:17 -04:00
Andromeda Yelton f2e9559a3a beginning of a notification to RHs when someone wishlists their work 2012-08-31 13:47:01 -04:00
eric 94270f33c6 add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager 
also removed unused target, lists, ack-link,
 2012-08-31 03:16:04 -04:00
eric f299d9ecf7 rip out paypal and amazon code 2012-08-31 03:12:15 -04:00
Andromeda Yelton 863bfe5856 /about/ pages need appropriate styling and should not conflict if user clicks on About in header 2012-08-28 13:47:29 -04:00
Andromeda Yelton 13171f6472 making sure the styling works no matter where download link is clicked from 2012-08-28 10:22:47 -04:00
Andromeda Yelton 07c529a715 read it now should link to download page 2012-08-28 10:22:30 -04:00
Andromeda Yelton 24abca09b7 revising download instructions per feedback from testers 2012-08-28 10:08:06 -04:00
Andromeda Yelton eb5eb17d83 was driving me crazy that that went to preview rather than campaign itself for active campaigns 2012-08-27 16:40:40 -04:00
Andromeda Yelton 48e20a7cdd bringing all the lightboxes under the hijax.js system 2012-08-27 15:35:29 -04:00
Andromeda Yelton 307e0d41c7 completed first draft of download instructions 2012-08-27 14:13:50 -04:00
Andromeda Yelton cc70ff1765 adding download instructions 2012-08-24 18:48:28 -04:00
Andromeda Yelton a6e034a36a rudimentary download page plus logic to serve it 2012-08-24 15:14:32 -04:00
eric 9c602cf530 typo 2012-08-23 18:24:52 -04:00
Andromeda Yelton 4fe0c3ff05 Merge branch 'master' of github.com:Gluejar/regluit 2012-08-23 14:10:11 -04:00
Andromeda Yelton aa3667d260 working on download page 2012-08-23 13:38:48 -04:00
eric 599d333e34 typo 2012-08-22 14:38:49 -04:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 
Conflicts:
	core/signals.py
 2012-08-16 17:11:12 -04:00
Andromeda Yelton 368a3ca8ec making license display more standards-compliant 2012-08-15 10:05:10 -04:00
Andromeda Yelton 28670ed01a building LOCKSS manifest page 2012-08-15 09:40:37 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
Andromeda Yelton 6d6c324a82 tweaking 2012-08-14 15:03:33 -04:00
Andromeda Yelton e2957abf25 tweaking 2012-08-14 14:53:48 -04:00
Andromeda Yelton 07f1177c08 we kinda got a lot of press coverage following the amazon shutdown 2012-08-14 10:11:31 -04:00
eric 403420a283 Add user-to-user credit transfers [#21784207] 2012-08-13 21:00:28 -04:00
eric e928a2dfa1 edit alert, make the box red again 2012-08-09 06:28:42 -04:00
thatandromeda e902c3c704 announcement at top of site edited to reflect Amazon situation 2012-08-08 16:11:52 -03:00
Andromeda Yelton 8ef30302d4 notice templates for campaign shutoffs due to amazon payment suspension 2012-08-08 14:19:04 -04:00
eric 0d13fe9ba4 2 more minus_amount s [#21784207] 2012-08-07 16:18:03 -04:00
eric 5362c202bb added management command to create credits, balance notification [#21784207] 2012-08-07 14:12:50 -04:00
Andromeda Yelton da0f4970c2 improving data flow of acks throughout system 2012-08-06 15:44:43 -04:00
Andromeda Yelton 8db1e5b59a set up acks page to deal with ack_name, _link, _dedication and anonymity bit 2012-08-06 13:35:29 -04:00
Andromeda Yelton 270a686049 Merge branch 'master' of github.com:Gluejar/regluit into mandatory_premiums 
Conflicts:
	static/css/lists.css
 2012-08-06 09:37:09 -04:00
Andromeda Yelton 2b16fc06a8 clarifying where the acks will happen 2012-08-01 12:08:52 -04:00
Andromeda Yelton f6f624fe87 addressing some questions we actually get about Amazon and Paypal and making sure answers on page are correct 2012-08-01 09:19:09 -04:00
Andromeda Yelton b041430731 front end for new pledge page, plus just enough back end that it displays 2012-08-01 08:52:39 -04:00
eric e8bd5ab2dc added ckeditor to manage campaign forms to provide rich text editing and image uploads [#32447975] 2012-07-27 14:23:44 -04:00
eric d478836e0e use profile.home_url in acks page where it's been set [#32366341] 2012-07-26 12:07:16 -04:00
thatandromeda 29fd89011c removing reference to "donate" 2012-07-25 11:51:05 -03:00
Raymond Yee 7f6b1fd684 refining script to produce data for OLA 
add user profile tagline to acks
 2012-07-25 07:15:51 -07:00
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
Andromeda Yelton fd5e73ea9b don't need adwords code for oral lit any more 2012-07-23 07:41:56 -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
eric d7638463b1 reporting facility for languages 2012-07-20 14:29:04 -04: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 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
Raymond Yee 7353731db5 4 campaigns now 2012-07-11 21:39:21 -07:00
thatandromeda df147937aa phrasing was unclear, scary. we're not space-limited here like we used to be. 2012-07-11 12:37:23 -03:00
eric e3be202189 "benefactors", not patrons [#30516251] 2012-07-11 09:18:14 -04:00
Andromeda Yelton 95c95dfcc8 added comment to explain about url dispatcher situation 2012-07-09 15:49:36 -04:00
Andromeda Yelton 69502b75ee need to convert urls to template variables or django-notification can't find them 2012-07-09 15:47:38 -04:00
Andromeda Yelton 59b3657808 we were using this verbatim in five different templates. DRY 2012-07-09 15:47:09 -04:00
Andromeda Yelton ac682c2c47 whoa hey. if we're using a TEMPLATING SYSTEM the notification content should probably be blocks inserted into a TEMPLATE, huh. 2012-07-09 11:33:21 -04:00
Andromeda Yelton d53ea242b6 changing 'staff picks' to 'noteworthy' 2012-07-09 10:53:58 -04:00
eric 01cb96e65d reported email as notices, not accounts 2012-07-09 09:25:31 -04:00
eric e2962e1075 [finish #30516251] supporter acknowledgement page basic version 2012-07-07 18:13:05 -04:00
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
eric b6d77a7645 usernames were not being URLescaped. [#finish #32365703] 2012-07-06 12:25:20 -04:00
eric 011dc4ffde [#32289649] validation nit 2012-07-06 11:19:51 -04:00
Andromeda Yelton 9152655587 list ungluers in two-column format by reverse of date wished [#32289815] 2012-07-05 11:33:57 -04:00
Andromeda Yelton b9aaff2968 david brin hooray 2012-07-05 11:33:18 -04:00
Andromeda Yelton 3ce4db8e9a change support to premiums and make it clickable [#32289833] 2012-07-05 10:39:19 -04:00
Andromeda Yelton 1bf0fe8d26 moving notification alert inline [#32289941] 2012-07-05 10:30:26 -04:00
Andromeda Yelton 85247c306e Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	core/models.py
 2012-07-05 10:21:08 -04:00
Andromeda Yelton 325765e453 loose ends from anaheim [#32290011] [#32289649] [#32289951] 2012-07-05 10:05:04 -04:00
Andromeda Yelton 6ccaf81f06 updated to reflect Amazon email so supporters won't be surprised by it 2012-07-02 11:07:10 -04:00
Raymond Yee bfe02fc39d 4->3 active campaigns 2012-06-29 18:38:19 -07:00
Andromeda Yelton 8fbc65a305 merge 2012-06-28 14:31:48 -07:00
Andromeda Yelton de929363e5 we are going to need an unsuccessful campaign signal asap, sadly 2012-06-28 14:07:33 -07:00
eric 8be8883e63 draft of front matter template (not used yet) 2012-06-28 16:23:29 -04:00
thatandromeda cbef02e3fc moar boingboing 2012-06-28 12:45:21 -07:00