15ea12534a
[ #32488017 ] merge conflicts
2012-07-10 16:03:36 -04:00
f2a1bac760
[start #32488017 ] added some logging of send_mail task
2012-07-10 15:57:44 -04:00
c8f0143630
Merge branch 'master' into ola_fulfill
2012-07-09 14:04:21 -07:00
a5d0ef36d7
Merge branch 'feedback'
2012-07-09 10:09:59 -07:00
2f49651466
Force the from_email to be settings.DEFAULT_FROM_EMAIL unless you really want your from_email
2012-07-09 10:08:49 -07:00
d869431b43
a first pass at getting a model for getting premium feedback for the OLA campaign
2012-07-09 09:28:50 -07:00
dcee8182bf
restricting displayed ungluers to those with nonempty wishlists
2012-07-09 10:53:44 -04:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
21e3cb582d
fix tabs
2012-07-07 18:12:54 -04:00
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
0329976165
send signal for unsuccessful campaign notifications
2012-07-05 10:04:27 -04:00
5e3cf5d7aa
Latest integration of campaign data in our own db plus the spreadsheet you can download from Amazon payments
...
to produce CVS file
2012-07-03 07:46:42 -07:00
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
9ac4aa26bd
hook the unsuccessful_campaign to the right notice
2012-06-29 09:52:06 -07:00
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
d3da49cf74
Stepping stone to correlating payments with Amazon data
...
print 1 email / line
2012-06-26 19:36:14 -07:00
dfe17f94fa
[finish #31637107 ] refactored transaction summary code, now considers pending and other transactions
2012-06-21 23:20:58 -04:00
0a259165a1
[ fix #31498847 ] the helrond bug
2012-06-21 23:20:57 -04:00
e9e9ee135b
expect the test to succeed again
2012-06-21 23:20:57 -04:00
cb9eb1e24e
detab code
2012-06-21 23:20:57 -04:00
d37792c813
[ #31605173 ] This plugs .../pledge/work_id where work_id tied to no campaign or a campaign that is not ACTIVE
2012-06-21 10:16:51 -07:00
e3ec5ba1ee
don't return empty rightsholder for campaign if it's SUCCESSFUL.
...
Remaining question: why does the RH for a campaign depend at all on campaign status? If it doesn't, we should remove dependence
2012-06-21 07:36:44 -07:00
3988335072
Add a command to list queued notices
2012-06-21 05:18:12 -07:00
6389c25f11
Trying to import successful_campaign differently
2012-06-20 21:09:05 -07:00
ea4fc308a0
Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline.
...
Set a bookloader test to expected failure while it might be a transient error
2012-06-20 15:48:55 -07:00
1f77371b7b
1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
...
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
457aba97bd
Merge branch 'master' into fps
2012-06-13 14:43:24 -04:00
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
c745452b4f
Merge branch 'master' into fps
2012-06-11 11:44:19 -04:00
ed92de66be
default premium description in fixture was different from TOS: username, not name to be used in acknowledgements
2012-06-11 11:39:25 -04:00
3d07e09424
Merge branch 'master' into fps
...
Conflicts:
payment/manager.py
2012-06-08 15:02:57 -04:00
d029e02bb4
Adding skeleton row locking code for demo
2012-06-01 12:20:17 -04:00
79bdcf3f5c
commenting
2012-05-29 21:16:01 -04:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
fccedc50d7
Goodreads problem has been fixed: http://www.goodreads.com/topic/show/908732?utm_medium=email&utm_source=comment_instant#comment_51301819
2012-05-29 16:23:57 -07:00
52ed00b80b
Marking core.GoodreadsTest.test_review_list_unauth as expected failure for now. I believe there is a problem on
...
the Goodreads side and have reported the problem: http://www.goodreads.com/topic/show/908732-api-problem-http-status-code-500-for-list-xml#comment_51296303
I will need to turn this test back on once Goodreads fixes the problem
2012-05-29 15:27:54 -07:00
8ce6ffe530
Pull which payment processor is involved from the transaction itself not from the settings.PAYMENT_PROCESSOR
2012-05-29 15:01:48 -07:00
111e10f380
Expose what http code we are getting from goodreads when we get something that is not 200
2012-05-29 12:47:38 -07:00
4e81f743b4
removed import loop
2012-05-29 12:08:28 -04:00
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
2563dda3e5
creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent
2012-05-29 08:54:57 -04:00
bafeb92bdd
[ #29809805 ] fixed email dedupe email at account activate fails when more than one prior account
2012-05-26 17:27:10 -04:00
a2514eb99c
Got rid of small typo in wishlist_unglued_book_released notice type description
2012-05-25 13:49:45 -07:00
1bb459e71d
resolve test conficts
2012-05-25 14:54:08 -04:00
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
4ec7fef25c
log adding book only if it's new to the database
2012-05-25 13:13:15 -04:00
b3610e17f3
added hard updates of campaign objects
2012-05-25 13:52:25 -03:00
a77d2e3fea
The campaign setup for test_merge_works was wrong but fixing it causes the test to fail on my machine and I cannot fathom why. Fixing it directly on github to make sure I haven't done something else stupid.
2012-05-25 13:03:23 -03:00
a830d5af48
eric wanted me to write a test so I did. tests percent_of_goal
2012-05-22 11:07:05 -04:00
c61bc9985d
test for factored license url [ #29884981 ]
2012-05-20 00:12:16 -04:00
f72796acdf
factor license URL and badge into one class [ #29884981 ]
2012-05-20 00:10:56 -04:00
61ec9db6a2
tab->spaces
2012-05-20 00:06:04 -04:00
085b67fb93
making sure not to run into int/float mismatch problems, and also it's ok if the percent goes over 100
2012-05-17 14:51:53 -04:00
d94b23e2fe
wow so calculating percents totally works better when you multiply by one hundred huh
2012-05-17 14:47:32 -04:00
23b8ec4987
redeleteing UNGLUEIT_SHORTEST_DEADLINE
2012-05-17 11:36:15 -04:00
20a99412ab
streamlining percent_of_goal
2012-05-17 09:24:37 -04:00
57d74ecea1
Added:
...
from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE
2012-05-16 08:18:04 -07:00
bd66c62842
tell Jenkins about setting.PAYMENT_PROCESSOR (while we transition to having code look up transaction.host)
...
add missing comma
2012-05-16 07:47:16 -07:00
b9de19bb09
modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom
2012-05-16 10:35:58 -04:00
2bf67671ad
supporters should only return people with active transactions, not e.g. canceled ones
2012-05-16 10:24:03 -04:00
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
6c3c1a8cd5
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-15 15:44:54 -04:00
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
d56b7a6453
First pass at a django admin command to check integrity of payments
2012-05-15 07:23:02 -07:00
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
33f7c99a5b
added a campaign.rightsholder property to make it not annoying to put rh names into templates
2012-05-12 21:49:18 -04:00
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
a30976373f
better default cover for works with no google id [ #29488053 ]
2012-05-11 22:46:03 -04:00
70a1da6713
note comments at end about context needed for notification templates
2012-05-11 21:36:08 -04:00
4c7fef1ce5
typo was bugging me
2012-05-11 21:35:52 -04:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
33642190cb
Allows set_key command to set keys that already exists
2012-05-10 08:34:45 -07:00
40a660e9b6
Add a set_key django admin command to make it easier to load keys
2012-05-09 17:17:18 -07:00
4deae23fd4
Ooops -- I forgot one migration
2012-05-09 11:42:29 -07:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
8a8f82a9a9
[ #29272807 ] Forgot to make core.models.Key.name unique
2012-05-08 16:47:07 -07:00
9b2693ed8b
[ #29272807 ] Implementation of an encrypted keystore as core.models.Key
...
NOTE MIGRATION needed
* Immediate reason for this implementation is to make it harder for our AWS keys to be compromised -- this will allow us to store them in encrypted (AES 256) form in the db, which will require ability to run mysql on the EC2 instance
* depends on a Django settings.SECRET_KEY, which for now, we might store in settings/local.py -- we could get fancier about how to serve that up
2012-05-08 16:08:36 -07:00
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
687df0c415
Changing ry-dev.dyndns.org -> ry-dev.unglueit.com
2012-05-07 15:57:30 -07:00
09a8f90740
Added a site definition for just.unglueit.com
2012-05-07 13:14:31 -07:00
a32b09a4cb
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:18:11 -04:00
c0cb99e040
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:18:11 -04:00
d334fa58b0
Revert "Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""""
...
This reverts commit b21787a590
2012-05-07 01:18:11 -04:00
e10136f1b2
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit 1bbac102a2
2012-05-07 01:18:11 -04:00
1bbac102a2
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:47 -04:00
b21787a590
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:14:47 -04:00
c8be251ffa
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:01 -04:00
2d344a09c6
Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"
...
This reverts commit 7043e71c39
2012-05-07 01:11:26 -04:00
7043e71c39
[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration
...
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
900bb88eaf
[ #28945859 ] create description on work, migrate data
2012-05-06 23:01:56 -04:00
e93a6d7523
[ #28945859 ] now pulling description from OL, looking for all editions
2012-05-06 22:31:38 -04:00
3f1c2d6c5c
Making explicit that a Campaign needs to have an active claim in order to be activated.
2012-05-03 00:19:40 +00:00
eric
Raymond Yee
Andromeda Yelton
Jason
Raymond Yee