eric
99c434d940
[ fix #45405325 ] fix merge subjects, also added test
2013-03-01 13:13:14 -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
eric
9811012bf3
fix rare bugs
2013-02-25 18:31:37 -05:00
eric
242cb66451
mitigate bug for campaigns that didn't get a success date
2013-02-21 15:57:49 -05:00
eric
596d19596c
UI work for managers to contact supporters [ #36991391 ]
2013-02-21 15:10:01 -05:00
Raymond Yee
da3d542587
Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
...
No staff in ungluers list
2013-02-19 08:38:27 -08:00
Raymond Yee
df0c781f67
change instance for bookloader test -- old example no longer in Google Books
2013-02-18 09:17:15 -08:00
Andromeda Yelton
e7bf70fadf
only filter out staff when there are lots of options
2013-02-18 09:09:54 -05:00
Andromeda Yelton
eb7d77dc5d
don't display staff in ungluers list
2013-02-06 15:05:16 -05:00
Andromeda Yelton
cd40fe99ef
making it faster
2013-02-04 13:32:21 -05:00
Andromeda Yelton
fa7e0b20de
addressing feedback
2013-01-04 15:12:35 -05:00
Andromeda Yelton
8867724ae9
make a work's rightsholders accessible from the templates
2013-01-03 13:18:00 -05:00
Andromeda Yelton
8d321d46dc
final incorporation of all stray CSS changes
2013-01-02 15:55:10 -05:00
eshellman
a6186e3bc6
Merge pull request #90 from Gluejar/prettier_acks
...
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
eric
e305a1ee74
Merge branch 'master' into prettier_acks
2013-01-02 10:53:05 -05:00
eshellman
c22403356c
Merge pull request #99 from Gluejar/correct_ungluing_date
...
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
Andromeda Yelton
f4a269f5ac
returning empty string rather than False
2012-12-31 15:02:39 -05:00
Andromeda Yelton
47c44b20d5
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
2012-12-31 11:00:45 -05:00
Raymond Yee
a726a11154
[ fix #41788889 ] google id for book changed
2012-12-31 10:10:24 -05:00
Andromeda Yelton
b7721f0fa3
management command to make sure transaction.ack_name returns something sensible for OLA on /acks/ page
2012-12-19 11:00:33 -05:00
Andromeda Yelton
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
Andromeda Yelton
7c88279603
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-14 10:03:57 -05:00
eric
fec7f33d9e
staff only UI for merging works [finish #39297681 ]
...
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
Andromeda Yelton
b05beaeaa7
need to actually handle anons and pass that data
2012-12-11 13:17:28 -05:00
Raymond Yee
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
eshellman
db1fdc321e
Merge pull request #79 from Gluejar/ending_soon_notification
...
Ending soon notification
2012-11-21 14:05:26 -08:00
Raymond Yee
ecea475419
a few modifications to pledge_failed notice
2012-11-21 11:40:19 -08:00
Raymond Yee
cbac6f1e3c
First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing
2012-11-21 09:21:01 -08:00
Andromeda Yelton
c4f32b38b5
moving ending soon notification to tasks
2012-11-21 11:09:07 -05:00
Andromeda Yelton
68a08d78c2
Revert "fire signal for time-running-out notification"
...
This reverts commit 4719c0b4b4
.
2012-11-21 09:12:21 -05:00
Raymond Yee
7f499bb6f2
Merge branch 'master' into charge_failed
2012-11-16 10:46:28 -08:00
Raymond Yee
279399e9b5
[ fix #39700567 ] Return a rightsholder name regardless of status of Campaign
2012-11-16 08:52:54 -08:00
Andromeda Yelton
2858ed194c
bugfixing
2012-11-16 11:43:00 -05:00
Andromeda Yelton
4719c0b4b4
fire signal for time-running-out notification
2012-11-16 10:37:12 -05:00
Andromeda Yelton
f25f3c81ee
construct notification handler
2012-11-16 10:24:48 -05:00
Raymond Yee
02dd7a55da
Merge branch 'campaign_close' into charge_failed
2012-11-15 14:38:23 -08:00
Raymond Yee
03a751626e
Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing
2012-11-15 14:37:04 -08:00
Raymond Yee
1739064229
return True incorrect place in Campaign.update_status
2012-11-15 13:06:12 -08:00
Raymond Yee
4e7fac0ecd
Merge branch 'campaign_close' into charge_failed
2012-11-13 10:20:49 -08:00
Raymond Yee
b2ca44da31
Now automatically process transactions based on status of campaigns
2012-11-13 10:15:38 -08:00
Raymond Yee
f4c8c67850
[ #39477485 ] allow campaigns to succeed if amount sufficient before campaign deadline
2012-11-13 09:01:05 -08: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
Andromeda Yelton
f9f19b2043
if last transaction ack_name was blank, use username as ack_name
2012-10-23 09:37:00 -04:00
Andromeda Yelton
b7ce48bfb0
fix anon_pref
2012-10-19 14:01:22 -04:00
Andromeda Yelton
41f59024f4
last_transaction now a property on the profile
2012-10-18 15:51:52 -04:00
Andromeda Yelton
bcba88221f
ack_name and anon_pref are now properties on user profile
2012-10-18 13:50:02 -04:00
thatandromeda
8bc66ad0fb
Merge pull request #63 from Gluejar/goodreads_bug
...
replaced remaining text.strip() with safe_strip(text) -- and changed saf...
2012-10-16 11:11:25 -07:00
Andromeda Yelton
3831a1ea59
clarifying kwarg
2012-10-16 11:36:51 -04:00
Raymond Yee
0df16957db
replaced remaining text.strip() with safe_strip(text) -- and changed safe_strip to a try/except approach to handle cases which a_string does not evaluate to False but nonetheless does not have strip method
2012-10-16 08:21:55 -07:00
Andromeda Yelton
ae9a541ed5
too many ways we might add to wishlist to test for. adding argument for notification. [[ #37780515 ]
2012-10-16 11:06:13 -04:00
Andromeda Yelton
2cd87369e1
only fire wishlist_added notification for actual new additions
2012-10-16 10:20:24 -04:00
eric
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
eric
3e2d65afd9
list the user's pledges [ #37674453 ]
...
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
eric
5bde0da8ca
[ #37716025 ] reuse a user's credit card
2012-10-13 13:45:46 -04:00
Raymond Yee
018332d508
[ #37388341 ] First crack at displaying campaign data -- per Melinda's request
2012-10-08 17:47:55 -07:00
eric
7f1dc2d3ca
merge works wasn't merging claims
2012-10-05 17:55:14 -04:00
eshellman
b5148f39fc
Merge pull request #33 from Gluejar/pledged_badges
...
clean up two loose ends; gotta see what jenkins thinks of it
2012-10-03 17:38:02 -07:00
eric
04002e40a2
jenkins build errors suggest some environments evaluate module attributes differently
2012-10-03 20:35:05 -04:00
eric
75e0a4c534
clean up two loose ends
2012-10-03 17:36:17 -04:00
eric
c26532c0fd
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-10-03 17:08:54 -04:00
eric
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04: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
6a6c249c83
f[inish #37068821 ] selectable 0.4.0 and later incompatible with earlier code
...
see
http://django-selectable.readthedocs.org/en/version-0.5.2/releases.html .
In general, we can't blithely update our imported modules without
reading the release notes.
2012-10-02 18:47:52 -04:00
Andromeda Yelton
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
thatandromeda
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
eric
759e39f61d
wired badge awarding into pledge modified and pledge complete signals
2012-10-01 18:28:26 -04:00
eric
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
eric
5fe7e63508
not sure why it also worked without this
2012-10-01 09:48:57 -04:00
Andromeda Yelton
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
eric
4a15cc5ce7
added documentation for mysql path, removed hard encoding from goodreads#253
2012-09-30 18:05:15 -04:00
Raymond Yee
22106d4112
r.content already encoded --> so r.content.encode('utf-8') is wrong -- doesn't cause exception if sys default encoding is UTF-8 -- but problematic if default is ASCII
2012-09-30 08:44:25 -07: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
eric
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
eshellman
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
Raymond Yee
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
Raymond Yee
2211cf1231
Added a few comments to Campaign.clone() and Campaign.clonable() to make more explicit the behavior and construction of these methods
2012-09-27 13:45:13 -07:00
eshellman
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
eric
e23d706469
Added tests for campaign.clone and Premiums
2012-09-25 16:43:25 -04:00
eshellman
45318c4e81
stop using id as variable name
2012-09-25 17:26:45 -03:00
Andromeda Yelton
e62484f46a
whoops wrong edition
2012-09-25 12:27:39 -04:00
Andromeda Yelton
2e23ddfd54
with format icons now in download page link counts are different
2012-09-25 11:10:23 -04:00
eric
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
eric
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
Raymond Yee
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
eric
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
eric
8611f73382
give badges to users who've pledged! [ #29340547 ]
2012-09-22 23:54:06 -04:00
eshellman
376dbdac37
Update core/models.py
...
added comment to Campaign.clone method
2012-09-22 13:00:17 -03:00
eric
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
eric
40a5b09359
rh_tools now shows campaign totals by campaign [ #16581715 ]
2012-09-21 12:32:32 -04:00
eric
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
Andromeda Yelton
756c1da430
download page test needs to cover readmill addition and new unglued flag handling
2012-09-19 12:37:37 -04:00
Andromeda Yelton
2216369bbf
include clickable links, make grammar singular/plural sensitive
2012-09-18 10:16:08 -04:00
eric
389e01d1cc
fixed out of order migrations.
2012-09-17 16:00:28 -04:00
Raymond Yee
da2f1e0665
Merge branch 'master' into relaunch
2012-09-14 17:05:29 -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
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
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
eric
de9da54206
sorting the premiums turned out to be easy
2012-09-07 17:56:58 -04:00
eric
4700e63b06
resolve conflict
2012-09-07 16:26:09 -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
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
eric
eb185438b4
methods currently marked as classmethods are really staticmethods
2012-09-07 01:04:18 -04:00
Andromeda Yelton
49f36e659e
whoops resolving merge
2012-08-31 13:47:31 -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
7c4a2b94f0
documented up_or_down parameter on pledge_modified signal handler
2012-08-31 02:50:38 -04:00
eric
618eda4aa5
eliminate db skew between prod and relaunch
2012-08-31 02:49:04 -04:00
Andromeda Yelton
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -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
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
Andromeda Yelton
291a2f5d67
need to know which ebook is the unglued one. migration needed
2012-08-15 09:39:58 -04:00
eric
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
Andromeda Yelton
69d85e6565
need a no-premium option. make sure to syncdb
2012-08-14 14:14:03 -04:00
eric
3d7cd7fdae
management command to set active campaigns to UNSUCCESSFUL, trigger amazon notice
2012-08-09 09:47:10 -04:00
Andromeda Yelton
3d112d16d3
need to define signal before using it
2012-08-08 15:02:12 -04:00
Andromeda Yelton
3fdc3a3f22
Merge branch 'master' of github.com:Gluejar/regluit
2012-08-08 14:43:50 -04:00
Andromeda Yelton
e07f8487ee
added signal receiver to send notifications in re amazon-shutdown campaigns
2012-08-08 14:22:33 -04:00
eric
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
eric
c36e49e42d
set up badges back end [ #29340547 ]
2012-08-06 22:34:20 -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
eric
3bdde8f936
finally I understand how reclustering should work
2012-08-05 18:30:13 -04:00
eric
cbb40f5511
added a safer relate editions method which won't cause big clusters to merge
2012-08-05 13:05:35 -04:00
eric
05767741d6
take extra care for null works
2012-08-05 13:03:37 -04:00
eric
48d54fdc39
management command to list works with no isbn
2012-08-03 14:42:02 -04:00
eric
2f109bef47
add email export management command
2012-08-03 11:16:47 -04:00
eric
05eb26d2cb
use correct syntax for exception lists
2012-08-02 22:36:11 -04:00
eric
04335be3aa
add a title filtering parameter to relookup_isbns
2012-08-02 20:44:08 -04:00
eric
c0af96784b
catch the exception that really occurs when there's no isbn
2012-08-02 18:35:52 -04:00
eric
1c4c0b0958
fix google all of a sudden throwing ip geolocation errors
2012-07-31 16:06:11 -04:00
Raymond Yee
e76f30ed28
Lowering expected editiion and subject count for bookloader.add_by_googlebooks_id('c_dBPgAACAAJ') in the test
2012-07-30 08:23:38 -07:00
Raymond Yee
aeda28bae5
Add handling for anonymity and overriding of username in acks
2012-07-30 08:05:02 -07:00
eric
184dfedda9
added override of one month OL cache [ #33377581 ]
2012-07-27 15:58:53 -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
Raymond Yee
e7d2589b77
updated output script for OLA
2012-07-27 09:01:04 -07:00
eric
63a8113414
management command to fix openlibrary descriptions delivered as dicts [finish #33377581 ]
2012-07-26 13:39:46 -04:00
eric
12671ddcdf
unpack openlibrary descriptions delivered as dicts [ #33377581 ]
2012-07-26 12:07:16 -04:00
Raymond Yee
495ad32122
Updated output of A-D for OLA acks
2012-07-25 16:18:39 -07: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
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
Raymond Yee
685cc36234
Now printing out a lot of info for each supporter
2012-07-20 18:45:11 -07: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
Raymond Yee
f7e49edfcb
Continuing work on collecting info for OLA pledges
2012-07-18 10:49:25 -07:00
Andromeda Yelton
362a4d2b85
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 14:52:38 -04:00
Raymond Yee
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
Raymond Yee
7a76a2cbaf
Merge branch 'master' into ola_fulfill
2012-07-10 14:15:28 -07:00
eric
ccef6ba411
again [start #32488017 ]
2012-07-10 16:06:57 -04:00
eric
15ea12534a
[ #32488017 ] merge conflicts
2012-07-10 16:03:36 -04:00
eric
f2a1bac760
[start #32488017 ] added some logging of send_mail task
2012-07-10 15:57:44 -04:00
Raymond Yee
c8f0143630
Merge branch 'master' into ola_fulfill
2012-07-09 14:04:21 -07:00
Raymond Yee
a5d0ef36d7
Merge branch 'feedback'
2012-07-09 10:09:59 -07:00
Raymond Yee
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
Raymond Yee
d869431b43
a first pass at getting a model for getting premium feedback for the OLA campaign
2012-07-09 09:28:50 -07:00
Andromeda Yelton
dcee8182bf
restricting displayed ungluers to those with nonempty wishlists
2012-07-09 10:53:44 -04:00
eric
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
eric
21e3cb582d
fix tabs
2012-07-07 18:12:54 -04:00
eric
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -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
0329976165
send signal for unsuccessful campaign notifications
2012-07-05 10:04:27 -04:00
Raymond Yee
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
Raymond Yee
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
Raymond Yee
9ac4aa26bd
hook the unsuccessful_campaign to the right notice
2012-06-29 09:52:06 -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
Raymond Yee
d3da49cf74
Stepping stone to correlating payments with Amazon data
...
print 1 email / line
2012-06-26 19:36:14 -07:00
eric
dfe17f94fa
[finish #31637107 ] refactored transaction summary code, now considers pending and other transactions
2012-06-21 23:20:58 -04:00
eric
0a259165a1
[ fix #31498847 ] the helrond bug
2012-06-21 23:20:57 -04:00
eric
e9e9ee135b
expect the test to succeed again
2012-06-21 23:20:57 -04:00
eric
cb9eb1e24e
detab code
2012-06-21 23:20:57 -04:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
3988335072
Add a command to list queued notices
2012-06-21 05:18:12 -07:00
Raymond Yee
6389c25f11
Trying to import successful_campaign differently
2012-06-20 21:09:05 -07:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
457aba97bd
Merge branch 'master' into fps
2012-06-13 14:43:24 -04:00
Andromeda Yelton
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
Raymond Yee
c745452b4f
Merge branch 'master' into fps
2012-06-11 11:44:19 -04:00
eric
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
Raymond Yee
3d07e09424
Merge branch 'master' into fps
...
Conflicts:
payment/manager.py
2012-06-08 15:02:57 -04:00
Jason
d029e02bb4
Adding skeleton row locking code for demo
2012-06-01 12:20:17 -04:00
Andromeda Yelton
79bdcf3f5c
commenting
2012-05-29 21:16:01 -04:00
Andromeda Yelton
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
Andromeda Yelton
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
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
Raymond Yee
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
eric
4e81f743b4
removed import loop
2012-05-29 12:08:28 -04:00
Andromeda Yelton
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
Andromeda Yelton
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
eric
bafeb92bdd
[ #29809805 ] fixed email dedupe email at account activate fails when more than one prior account
2012-05-26 17:27:10 -04:00
Raymond Yee
a2514eb99c
Got rid of small typo in wishlist_unglued_book_released notice type description
2012-05-25 13:49:45 -07:00
eric
1bb459e71d
resolve test conficts
2012-05-25 14:54:08 -04:00
eric
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
eric
4ec7fef25c
log adding book only if it's new to the database
2012-05-25 13:13:15 -04:00
eshellman
b3610e17f3
added hard updates of campaign objects
2012-05-25 13:52:25 -03:00
eshellman
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
Andromeda Yelton
a830d5af48
eric wanted me to write a test so I did. tests percent_of_goal
2012-05-22 11:07:05 -04:00
eric
c61bc9985d
test for factored license url [ #29884981 ]
2012-05-20 00:12:16 -04:00
eric
f72796acdf
factor license URL and badge into one class [ #29884981 ]
2012-05-20 00:10:56 -04:00
eric
61ec9db6a2
tab->spaces
2012-05-20 00:06:04 -04:00
Andromeda Yelton
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
Andromeda Yelton
d94b23e2fe
wow so calculating percents totally works better when you multiply by one hundred huh
2012-05-17 14:47:32 -04:00
eric
23b8ec4987
redeleteing UNGLUEIT_SHORTEST_DEADLINE
2012-05-17 11:36:15 -04:00
Andromeda Yelton
20a99412ab
streamlining percent_of_goal
2012-05-17 09:24:37 -04:00
Raymond Yee
57d74ecea1
Added:
...
from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE
2012-05-16 08:18:04 -07:00
Raymond Yee
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
Andromeda Yelton
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
Andromeda Yelton
2bf67671ad
supporters should only return people with active transactions, not e.g. canceled ones
2012-05-16 10:24:03 -04:00
Andromeda Yelton
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
eric
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
Andromeda Yelton
6c3c1a8cd5
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-15 15:44:54 -04:00
Andromeda Yelton
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
Raymond Yee
d56b7a6453
First pass at a django admin command to check integrity of payments
2012-05-15 07:23:02 -07:00
eric
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
Andromeda Yelton
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
Andromeda Yelton
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
Andromeda Yelton
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
Andromeda Yelton
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
Andromeda Yelton
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
eric
a30976373f
better default cover for works with no google id [ #29488053 ]
2012-05-11 22:46:03 -04:00
Andromeda Yelton
70a1da6713
note comments at end about context needed for notification templates
2012-05-11 21:36:08 -04:00
Andromeda Yelton
4c7fef1ce5
typo was bugging me
2012-05-11 21:35:52 -04:00
eric
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
eric
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
Raymond Yee
33642190cb
Allows set_key command to set keys that already exists
2012-05-10 08:34:45 -07:00
Raymond Yee
40a660e9b6
Add a set_key django admin command to make it easier to load keys
2012-05-09 17:17:18 -07:00
Raymond Yee
4deae23fd4
Ooops -- I forgot one migration
2012-05-09 11:42:29 -07:00
eric
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
.
2012-05-09 09:37:57 -04:00
Raymond Yee
8a8f82a9a9
[ #29272807 ] Forgot to make core.models.Key.name unique
2012-05-08 16:47:07 -07:00
Raymond Yee
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
Andromeda Yelton
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
Raymond Yee
687df0c415
Changing ry-dev.dyndns.org -> ry-dev.unglueit.com
2012-05-07 15:57:30 -07:00
Raymond Yee
09a8f90740
Added a site definition for just.unglueit.com
2012-05-07 13:14:31 -07:00
eric
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
eric
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
eric
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
eric
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
eric
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
eric
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
eric
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
eric
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
eric
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
eric
900bb88eaf
[ #28945859 ] create description on work, migrate data
2012-05-06 23:01:56 -04:00
eric
e93a6d7523
[ #28945859 ] now pulling description from OL, looking for all editions
2012-05-06 22:31:38 -04:00
Raymond Yee
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
Raymond Yee
b289a8cfd3
Fixing how now() is being called in random_campaigns command
2012-05-02 23:49:55 +00:00
eric
bbb5da7186
fixed lower case format values
2012-05-02 12:32:11 -04:00
eric
4d13953e41
We're not allowed to store descriptions from google
2012-05-01 16:25:38 -04:00
eric
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
eric
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
eric
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
Andromeda Yelton
6dcefd157c
typo fixes and wording clarity in notification descriptions. requires syncdb\!
2012-04-27 08:46:54 -04:00
eric
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
eric
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
eric
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
eric
78edf747a7
reorganize notifications [ #27014673 ]
2012-04-24 22:44:59 -04:00
eric
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
Raymond Yee
51d1bb938f
A change in the Goodreads API: http://www.goodreads.com/topic/show/867018-stuff-broken-since-last-thursday -- removing trailing '/' fixes the problem (for now!)
2012-04-24 14:37:33 -07:00
Andromeda Yelton
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
Raymond Yee
ac7f9afc2a
Align ry back to master while keeping changes in random_tasks.py
2012-04-18 15:08:16 -07:00
Raymond Yee
3cf232a804
Merge branch 'master' of github.com:Gluejar/regluit into ry
...
Conflicts:
core/signals.py
2012-04-18 15:01:47 -07:00
eric
5f4f381e06
fix problem where Goodreads has started to return empty descriptions
2012-04-13 17:53:18 -04:00
eric
80c3a0090f
fix spelling before it leads to bugs. will need to syncdb
2012-04-11 13:37:36 -04:00
eric
d5d26e356f
this is how to turn off emails by default for a notification type [finish #27116165 ]
2012-04-09 11:55:58 -04:00
eric
147808bd88
[finish #27470199 ] inactivate checked premium button no longer shows if there are no checked premiums
2012-04-05 22:44:45 -04:00
eric
be909bba69
change language on claim status [accept #27384493 ]
2012-04-05 11:58:26 -04:00
Raymond Yee
1031a80a5e
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
core/signals.py
2012-04-04 10:08:59 -07:00
eric
8cf4209b54
removed comments
2012-04-03 15:54:41 -04:00
Ed Summers
331d886a7c
need to rewrite cover image urls in googlebooks api search results too
2012-04-03 15:27:33 -04:00
Raymond Yee
7cb3c038bd
Migrating existing twitter pic urls
...
MIGRATION required
Conflicts:
core/models.py
2012-04-03 11:54:20 -07:00
Ed Summers
df36d8bf65
save https url for twitter avatar
2012-04-03 14:46:31 -04:00
Raymond Yee
0f0ef412eb
Computing the twitter picture
2012-04-03 11:29:26 -07:00
Ed Summers
cd41708237
migration to convert facebook avatar urls to https
2012-04-03 14:10:56 -04:00
Ed Summers
5e25f2f90a
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-03 13:56:25 -04:00
Ed Summers
1187a346ee
use https urls for google books cover images
2012-04-03 13:55:45 -04:00
eric
86834f5e99
remove dead import
2012-04-03 11:47:41 -04:00
eric
c90c42a2e8
linefeeds
2012-04-03 11:17:59 -04:00
eric
aab0c47eeb
reconcile linefeeds
2012-04-03 11:10:49 -04:00
eshellman
87bcf412d9
really remove campaign activate signal
2012-04-03 12:05:50 -03:00
eshellman
7cca21a4fb
merge changes
2012-04-03 12:04:12 -03:00