Commit Graph

113 Commits (6e7344d8a4912006ed784358786b834bd1388e32)

Author SHA1 Message Date
eric c2649f6ab2 implemented borrowing methods, "BORROWED" license acq, RESERVES
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric aad6d72207 Merge branch 'master' into b2u_download
Conflicts:
	core/signals.py
2013-09-05 22:56:46 -04:00
eric b801eb4927 add acq handling to download
needs migration. should migrate core back to 0052 to refresh acq table

download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
eric f8df110163 only watermark on purchase 2013-08-29 11:57:41 -04:00
eric e51fa1190e wired watermarker into file uploads. migration needed 2013-08-26 23:56:01 -04:00
eric 1c33c34f21 purchase complete notification, contextual wishlist active, fulfillment in signal handler 2013-08-22 14:30:56 -04:00
eric 3bdb755419 move constant to params file to improve import 2013-08-22 14:22:54 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -04:00
Raymond Yee 46d1d4f767 Merge branch 'master' into expiring_cc
Conflicts:
	payment/models.py
	payment/tests.py
2013-07-08 10:52:44 -07:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Raymond Yee a3cc502924 get rid of AccountTest0
renamed notice to Credit Card Number Updated
actually save account in update_account_status
2013-05-20 13:58:21 -07:00
Raymond Yee 7265488484 Merge branch 'master' into expiring_cc 2013-04-26 08:58:47 -07:00
Andromeda Yelton aca759447d test for staffness in template 2013-04-24 11:28:05 -04:00
Andromeda Yelton 80ee477198 disambiguate staff and RH 2013-04-23 10:22:08 -04:00
Andromeda Yelton 516f867d87 removing word 'official' 2013-04-23 10:07:59 -04:00
Raymond Yee 3b900e2328 Align names signals.py with those in the short.txt for notices 2013-04-17 13:24:43 -07:00
Raymond Yee aca38d66a1 Merge branch 'master' into expiring_cc
Conflicts:
	payment/tests.py
2013-03-20 09:41:30 -07:00
eric 54d0aa1d59 merge master into seo
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
Andromeda Yelton dd1180ab30 notification description field limited to 100 characters 2013-03-12 16:12:11 -04:00
Andromeda Yelton 655a0a4f35 Merge branch 'master' into comment_notifications 2013-03-12 15:01:45 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
thatandromeda 99ba3499a7 Update signals.py 2013-03-12 11:58:33 -03:00
eric d3077c988b links should not point to http from https 2013-03-09 13:29:03 -05:00
eric b327818e89 merge manager_supporter_messages 2013-03-07 15:12:22 -05:00
eric 0f6f433551 official comments now sent to ALL wishers except for commenter 2013-03-07 15:08:21 -05:00
eric a56222426e set queueing to use the master switch
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric a53c99e295 decided that supporter_message signal belonged in core 2013-03-01 09:46:52 -05:00
eric d08ca3efbd Turns out site was already in context for notifications as "current_site"
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
Raymond Yee 7fef0a65f0 refining account_* notices 2013-02-27 15:18:32 -08:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
Raymond Yee ecea475419 a few modifications to pledge_failed notice 2012-11-21 11:40:19 -08:00
Andromeda Yelton 2858ed194c bugfixing 2012-11-16 11:43:00 -05:00
Andromeda Yelton f25f3c81ee construct notification handler 2012-11-16 10:24:48 -05:00
Raymond Yee 793d984ba3 Implemented basic transaction_failed signal and notices -- THEY STILL NEED WORK
Tests handle situation of transaction_failed too
2012-11-06 11:22:25 -08:00
Raymond Yee 96b62aa163 basic skeleton for test based on loading fixture
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
eric 462011ed7e add_pledge_badge was just a bug waiting to happen 2012-10-03 17:06:51 -04:00
Andromeda Yelton 3312a9108a anonymous pledges shouldn't add badge 2012-10-03 16:01:02 -04:00
eric 57dc500643 Revert "Revert "wired badge awarding into pledge modified and pledge complete signals""
This reverts commit 863055c305.
2012-10-03 08:57:24 -04:00
eric 863055c305 Revert "wired badge awarding into pledge modified and pledge complete signals"
This reverts commit 759e39f61d.
2012-10-03 08:56:29 -04:00
eric 759e39f61d wired badge awarding into pledge modified and pledge complete signals 2012-10-01 18:28:26 -04:00
eshellman 96a54adc4a Merge pull request #25 from Gluejar/new_wisher_notification_improvement
include clickable links, make grammar singular/plural sensitive
2012-09-28 14:47:47 -07:00
Andromeda Yelton 2216369bbf include clickable links, make grammar singular/plural sensitive 2012-09-18 10:16:08 -04:00
Raymond Yee e6f94223f4 Merge branch 'master' into relaunch_ry 2012-09-11 15:55:58 -07:00
eric dc94a207cc [start #35862759] fixed bug in handle_wishlist_added 2012-09-11 14:06:46 -04: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
Andromeda Yelton 49f36e659e whoops resolving merge 2012-08-31 13:47:31 -04:00