eric
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
.
2012-10-03 08:57:35 -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
65998ac219
this belongs with last commit
2012-10-02 23:51:25 -04:00
eric
73910ae8a0
To get credit module working again, had to move some methods into an object that inherits from a base class
...
So now all payment processor specific methods are on a Processor
object,
2012-10-02 23:49:19 -04:00
eric
7a1cf969ca
fixed circular import problems [finish #37053797 ]
2012-10-02 22:14:40 -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
eric
ceebcb690d
step one: fix media links [ #37068821 ]
2012-10-02 18:12:44 -04:00
Raymond Yee
aafbeebfb6
Merge branch 'master' into production
2012-10-02 14:18:25 -07:00
Raymond Yee
665fef9058
Merge branch 'master' of github.com:Gluejar/regluit
2012-10-02 14:07:17 -07:00
Raymond Yee
5b41103005
Merge pull request #31 from Gluejar/update_manage_campaign
...
Update manage campaign
2012-10-02 13:33:57 -07:00
Raymond Yee
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
Raymond Yee
e6b5146dff
the Stripe api keys for nonprofit partner should be gone
2012-10-02 12:06:38 -07:00
Raymond Yee
89b3b5c599
[ #37053797 ] reverting stripelib.py -- Sn tests run but django command test_stripe_charge fails: done so Eric can fix circular import issue:
...
>>> >>> >>> (regluitdj14)raymond-yees-computer:regluit raymondyee$ django-admin.py test_stripe_charge
Traceback (most recent call last):
File "/Users/raymondyee/.virtualenvs/regluitdj14/bin/django-admin.py", line 5, in <module>
management.execute_from_command_line()
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 443, in execute_from_command_line
utility.execute()
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 382, in execute
self.fetch_command(subcommand).run_from_argv(self.argv)
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 261, in fetch_command
klass = load_command_class(app_name, subcommand)
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/core/management/__init__.py", line 69, in load_command_class
module = import_module('%s.management.commands.%s' % (app_name, name))
File "/Users/raymondyee/.virtualenvs/regluitdj14/lib/python2.7/site-packages/django/utils/importlib.py", line 35, in import_module
__import__(name)
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/management/commands/test_stripe_charge.py", line 2, in <module>
from regluit.payment import stripelib
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py", line 10, in <module>
from regluit.payment.models import Account
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/models.py", line 4, in <module>
from regluit.core.models import Campaign, Wishlist, Premium, PledgeExtra
File "/Users/raymondyee/C/src/Gluejar/regluit/core/models.py", line 998, in <module>
from regluit.payment.manager import PaymentManager
File "/Users/raymondyee/C/src/Gluejar/regluit/payment/manager.py", line 2, in <module>
from regluit.payment.models import Transaction, Receiver, PaymentResponse
ImportError: cannot import name Transaction
2012-10-02 12:02:45 -07:00
Raymond Yee
72a440383d
a django command to do a test charge
2012-10-02 11:49:17 -07:00
Andromeda Yelton
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
Andromeda Yelton
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -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
Raymond Yee
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07: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
Andromeda Yelton
1cb2461daa
merging changes
2012-10-02 13:36:30 -04:00
eric
1b5a0d4bf3
Merge branch 'relaunch_ry' of https://github.com/Gluejar/regluit into relaunch_ry
2012-10-02 13:28:47 -04:00
eric
f9b48f2911
Revert "Revert "made some changes to reduce the likelihood of circular import dependencies in stripe code.""
...
This reverts commit 3abd95d482
.
2012-10-02 13:28:15 -04:00
Raymond Yee
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
Raymond Yee
27d0a808e0
get rid of more paypal references
2012-10-02 10:16:34 -07:00
Andromeda Yelton
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
Andromeda Yelton
4cf4787a95
don't display username
2012-10-02 09:32:33 -04:00
Andromeda Yelton
2c2ce2a34f
suppress display of any amount premium if it's the only premium
2012-10-02 09:29:18 -04:00
Andromeda Yelton
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
Andromeda Yelton
a9d9cde55a
grammar
2012-10-02 07:55:11 -04:00
eric
3abd95d482
Revert "made some changes to reduce the likelihood of circular import dependencies in stripe code."
...
This reverts commit 166afece62
.
2012-10-01 20:05:35 -04:00
Raymond Yee
166afece62
made some changes to reduce the likelihood of circular import dependencies in stripe code.
...
Made sure there is a core_key table in campaidgn_starter sql
2012-10-01 16:38:51 -07:00
eric
759e39f61d
wired badge awarding into pledge modified and pledge complete signals
2012-10-01 18:28:26 -04:00
Andromeda Yelton
d54f45d511
further aesthetic refinements
2012-10-01 15:53:41 -04:00
eric
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
Andromeda Yelton
6a6045e9ab
first pass at prettifying stripe process
2012-10-01 15:31:17 -04:00
eric
99c228323e
fix double toggle when clicking on star
2012-10-01 15:24:11 -04:00
eric
bf212ed165
prettier stars matching site colors
2012-10-01 15:10:45 -04:00
Raymond Yee
2eb4ac3e56
Add TEST_COLLATION of utf8_bin to just
2012-10-01 17:05:03 +00:00
eric
5fe7e63508
not sure why it also worked without this
2012-10-01 09:48:57 -04:00
Andromeda Yelton
fd845d627b
is unglued is not grammatical here
2012-10-01 09:47:32 -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
thatandromeda
38b2567a02
Merge pull request #27 from Gluejar/deannoyify_email_notices
...
[finish #31209035 ] removes first line from the email notices
2012-10-01 06:28:57 -07:00
thatandromeda
0955dc0f78
Merge pull request #29 from Gluejar/trivial_edits
...
Trivial edits
2012-10-01 06:16:46 -07:00
Andromeda Yelton
6117b8475f
minor style edits
2012-10-01 09:15:38 -04:00
Andromeda Yelton
abea3a67de
updating handling of premiums and anonymity
2012-10-01 09:12:40 -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
Raymond Yee
0f91fddea5
Make requirements_relaunch.pip available on production branch to make it easy to do migration to Django 1.4
2012-09-29 11:30:02 -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