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
72a440383d
a django command to do a test charge
2012-10-02 11:49:17 -07:00
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
1b5a0d4bf3
Merge branch 'relaunch_ry' of https://github.com/Gluejar/regluit into relaunch_ry
2012-10-02 13:28:47 -04:00
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
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
27d0a808e0
get rid of more paypal references
2012-10-02 10:16:34 -07:00
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
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
2eb4ac3e56
Add TEST_COLLATION of utf8_bin to just
2012-10-01 17:05:03 +00:00
5fe7e63508
not sure why it also worked without this
2012-10-01 09:48:57 -04:00
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
0955dc0f78
Merge pull request #29 from Gluejar/trivial_edits
...
Trivial edits
2012-10-01 06:16:46 -07:00
6117b8475f
minor style edits
2012-10-01 09:15:38 -04:00
abea3a67de
updating handling of premiums and anonymity
2012-10-01 09:12:40 -04:00
4a15cc5ce7
added documentation for mysql path, removed hard encoding from goodreads#253
2012-09-30 18:05:15 -04:00
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
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
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
51f8e90487
fixed markup syntax of faq
2012-09-28 17:16:25 -04:00
94ed8fa8df
removed unbalanced <span>
2012-09-28 17:09:21 -04:00
87e2d0e0b4
fix OLA work number 29340547
2012-09-28 16:02:03 -04:00
f336730800
[finish #31209035 ] found where that extra line came from
...
This is why I got email leakage
2012-09-28 15:50:43 -04:00
9e048c44f5
Get rid of print statement
2012-09-28 10:12:25 -07:00
750c86c16e
changing to lxml 2.3.5 since 3.0alpha2 was problematic -- could not find package now.
2012-09-28 09:15:40 -07:00
a53c0ac4f3
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-09-28 10:59:04 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
839a864149
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-28 10:40:56 -04:00
079487783c
incorporating AM's revisions to FAQ
2012-09-28 10:40:44 -04:00
8952886171
Merge branch 'master' into relaunch_ry
2012-09-27 20:15:57 -07:00
100ec44c0a
Adjust library versions -- still experimenting
2012-09-28 03:14:40 +00:00
62e89f469f
Adjusting library versions
...
seems like lxml 3.0alpha2 gone -> back to 2.3.5
2012-09-27 20:12:40 -07:00
81708661bb
Adding a requirements_relaunch.pip to see whether I can test whether I can the current master branch to run with the environment tested for relaunch
2012-09-27 19:12:46 -07:00
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
fe5df0fab8
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:39:50 -07:00
7ee772a16d
Merge pull request #22 from Gluejar/automanage_db_changes
...
now adding credit records in migration [start #36325665 ]
2012-09-27 14:38:56 -07:00
859f62a3d7
Merge branch 'automanage_db_changes' into relaunch_ry
2012-09-27 14:17:30 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
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
a859771c5c
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-27 13:30:46 -04:00
81f45984e8
prevent campaign launch button from being visible to non-staff during preview
2012-09-27 13:11:19 -04:00
880a9f14bd
now adding credit records in migration [start #36325665 ]
...
that wasn't so hard
2012-09-27 12:58:47 -04:00
2b2bea8978
not using that any more
2012-09-27 12:40:30 -04:00
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
4a10edce1d
[ #36469239 ] Now handles modifications where new amount > previous amount and cancellation of pledge
2012-09-27 09:32:29 -07:00
d1941de032
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-27 11:34:15 -04:00
99d4a3dd1c
need to be in preview mode until relaunch
2012-09-27 12:14:41 -03:00
a48f61793d
only staff can launch campaigns during preview
2012-09-27 12:14:09 -03:00
Raymond Yee
thatandromeda
eric
Raymond Yee