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 |
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 |