67c41df4b3
we have relaunched
2012-10-15 08:08:06 -07:00
1c5500a4e1
set NONPROFIT.is_on to false for launch
2012-10-12 13:47:43 -04:00
2bea7e89f4
Merge branch 'master' into pledge_pretty_stick
...
Conflicts:
frontend/templates/pledge.html
static/css/pledge.css
static/less/pledge.less
2012-10-05 15:06:37 -04:00
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
2eb4ac3e56
Add TEST_COLLATION of utf8_bin to just
2012-10-01 17:05:03 +00:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
99d4a3dd1c
need to be in preview mode until relaunch
2012-09-27 12:14:41 -03:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
adefc43154
first pass
2012-09-24 14:21:15 -04:00
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
9ccfb4be48
Ed's tired of getting unglue.it bug reports
2012-09-05 11:17:36 -04:00
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
d72e905628
Revert "seeinggoogle account limits are the problem"
...
This reverts commit 1551be38bf
2012-07-12 09:03:58 -04:00
1551be38bf
seeinggoogle account limits are the problem
2012-07-11 21:26:32 -04:00
f528fe3654
SERVER_EMAIL needs to be set to a verified SES email for mail_admins to work
2012-07-09 10:43:48 -07:00
cf2847544b
Fix the time when the campaign status dated -- 12:01 am -- maybe it should be 12:00
2012-06-29 18:22:19 -07:00
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
0bd6fdeaa0
Moving production over to Amazon SES
2012-06-22 17:13:24 -07:00
0f6b581655
Setting up to use Amazon SES for SMTP
...
NOTE new library: django-smtp-ssl
putting parameters in for just.py first to try out on just before moving to production
2012-06-22 16:38:29 -07:00
feba1c2b7d
[ #31613287 ] temporary fix for SMTP limit -- switch to new account
2012-06-21 12:45:43 -07:00
63143bf860
removing rest of is_preview
2012-06-13 13:30:39 -03:00
272d795ded
Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
...
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
b532a13bd0
Putting in MAINTENANCE_MODE for various local configurations
2012-05-17 13:56:44 -07:00
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
0ff30626bb
nuking UNGLUEIT_SHORTEST_DEADLINE from common.py
2012-05-17 09:06:19 -07:00
126e0f244e
Adding UNGLUEIT_SHORTEST_DEADLINE back
2012-05-17 08:34:46 -07:00
199921c015
Flipping IS_PREVIEW on production from True to False -- LAUNCHING
2012-05-17 08:21:51 -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
36a5e92d25
[finish #29677811 ] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
2012-05-15 23:42:31 -04:00
942d80688a
Add secure IPN settings to prod.py
2012-05-15 17:42:16 -07:00
450c1cdf56
Add settings for secure IPN -- the secure IPN doesn't work in RY's testing yet, however
2012-05-15 17:12:58 -07:00
65a7df298d
Adding secure IPN url for amazon payments
2012-05-15 16:52:05 -04:00
c500b8dbaa
TURN ON FPS PAYMENT -- let's see what happens
2012-05-13 23:11:47 -07:00
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
5cf4c17c33
Put in the right BASE_URL for production
2012-05-12 08:28:17 -07:00
43162c0406
On second thoughts, let's just try the sandbox first on unglue.it, then clear the transactions and the turn on the real money....
2012-05-12 08:10:31 -07:00
50d6998a92
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
2012-05-12 08:06:51 -07:00
1633b5a32d
Make it easier to flip the switch on whether to run the FPS sandbox or the real thing
2012-05-10 09:03:10 -07:00
9aa586181e
Wrapping the import of FPS keys in amazon.py so that things won't die if it gets imported before the database gets set up -- these changes don't break amazon functionality on ry's laptop and hopefully will be ok for jenkins.
2012-05-10 08:08:58 -07:00
069342276b
Merge branch 'ry'
2012-05-09 18:04:56 -07:00
16bb539931
Put please into paypay mode
2012-05-10 00:50:31 +00:00
090d36de66
[ #29272807 ] implemented storage of FPS_* keys in the db
2012-05-09 17:16:49 -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
6c829a0556
Fix the BASE_URL for just
2012-05-08 16:21:13 +00:00
11c79b1f89
Add site number for just.unglueit.com
2012-05-07 12:06:59 -07:00
04c9a46ede
Forgot to add settings/just.py
2012-05-07 19:05:58 +00:00
70210dca95
add looking for settings.local to the settings files
...
fabfile.list_backups
first cut at aws.create_dbinstance and aws.db_info
2012-05-05 13:45:50 -07:00
30c72f07e3
Have settings/common.py attempt to import a settings/aws.py to allow keys to be stored outside of github
2012-05-03 16:48:51 -07:00
a62d988249
Merge branch 'ry' of github.com:Gluejar/regluit
2012-05-03 18:41:21 +00:00
3725094aea
A few more steps needed to get rid of billing (aka django-merchant)
2012-05-03 11:17:27 -07:00
d2dccbd1c3
add a PAYMENT_PROCESSOR setting to common.py
2012-05-02 18:34:13 -07:00
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
803a49e5d7
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-24 11:57:00 -07:00
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -07:00
0279253aa2
emit_notice.sh has to +x mode
...
added a db encoding for test db for production
2012-04-20 17:18:54 +00:00
9a73decf78
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
2012-04-19 16:02:32 -07:00
929a70e498
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-04-19 12:58:13 -07:00
9016331ed0
Changing to root password on please, which should be ok when please gets rebooted.
2012-04-19 18:40:46 +00:00
03e9947189
Adding basic amazon FPS Pay function
2012-04-18 11:53:13 -04:00
c59923583b
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
settings/please.py
2012-04-18 08:13:38 -07:00
98cc04deb8
Turn off the spam Raymond
2012-04-17 14:07:14 -07:00
0969e05486
Test the spam raymond celerybeat task
2012-04-17 13:49:21 -07:00
f41265be6d
Turning on notification emission on please
2012-04-17 12:38:53 -07:00
b808ddbed0
Added URLs needed for the return from Amazon authorization.
...
Also forgot to put keys in prod.py
2012-04-11 10:37:41 -07:00
11be270cfd
Added AWS parameters to various settings files
2012-04-11 09:53:20 -07:00
00511e4730
First pass at trying to integrate Amazon fps
2012-04-11 09:51:18 -07:00
7690345aec
Added more documentation on setting up celerybeat to README.md
...
updated deployment scripts to launch celerybeat
2012-04-05 15:07:27 -07:00
7b4ed8830e
Make modifications to please.py and prod.py to reflect fact that common.py has base definitions for celerybeat tasks
2012-04-05 14:07:55 -07:00
8a0ed638d3
Add import regluit and datetime to common.py
2012-04-05 13:56:42 -07:00
600f2e7075
Put definition of CELERYBEAT variables in common.py and definition of some common tasks but don't turn them on in common -- do that in the respective local setups
2012-04-05 13:54:46 -07:00
2aae2f64c1
Added necessary import to settings -- datetime and regluit
2012-04-05 13:44:47 -07:00
b23f354029
Add the same celerybeat jobs configuration to production
2012-04-05 13:41:58 -07:00
22a5b19b56
Configure some jobs for celerybeat on please
2012-04-05 13:40:53 -07:00
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
883da1c873
Merge github.com:Gluejar/regluit
2012-03-29 16:28:04 -04:00
e4d98bd13e
context processors work better if you add them to settings
2012-03-29 16:26:22 -04:00
62e5c4b518
this setting no longer used [ #27115145 ]
2012-03-29 16:14:44 -04:00
30d7cbf1a9
either put the setting in common or the local settings, not both
2012-03-29 01:24:00 -04:00
2c12d84e2a
Set NOTIFICATION_QUEUE_ALL to True for now in various settings file
...
Added a few lines of documentation to signals.py around notifications
2012-03-27 14:53:07 -07:00
26eddf38fd
install notification
2012-03-27 11:52:23 -04:00
51cf67dca7
moved transaction settings to common.py
2012-03-26 16:18:31 -04:00
9199f78606
test/campaigntests.py has a BasicGuiTest.testFrontPage, which tests whether the Learn More link will toggle the description panel.
...
paypal/tests.py: made loginSandbox drop the test parameter and callable from outside of paypal/tests.py -- now, for example, from test/campaigntests.py
settings/dev.py: added LIVE_SERVER_TEST_URL, UNGLUEIT_TEST_USER, UNGLUEIT_TEST_PASSWORD -- parameters useful for selenium-based live server testing
the beginnings of test/campaigntests.support_campaign() -- a selenium script to drive automated pledging to campaign for testing purposes
2012-03-14 15:06:29 -07:00
feef3935d0
Adding a settings.LOCALDATETIME_NOW to allow for the computed current time to be changed for unglue.it -- useful for testing only! [ #22561067 ]
2012-03-09 10:34:14 -08:00
a252f9d173
[ #22561067 ] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
...
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
3cc1ab23de
account activation changed from 7 to 30 days
2012-03-03 17:26:50 -05:00
6b9c9a7653
changing version of jquery to 1.7.1
2012-02-14 11:28:48 -05:00
35d4fa4fd1
jquery back to local version for security reasons, only needed in common.py
2012-02-06 15:02:57 -05:00
7a94496c39
maybe the setting also needs to be in common to avoid breaking jenkins?
2012-02-06 14:29:47 -05:00
3c4d406a82
prod and please need to know about jquery_home and jquery_ui_home too
2012-02-06 14:14:09 -05:00
a35bb7cbba
there is now a setting for our versions of jquery ad jquery_ui. defaults to google hosted, use static to do offline dev. SO much less annoying.
2012-02-06 13:53:25 -05:00
6ea55848bd
Merge branch 'master' into ry
2012-01-26 07:38:00 -08:00
dcf477c34a
Adding a site for ry-dev to initial_data.json
...
Creating a separate celeryd_please.conf to handle please
Added SITE_ID to dev.py
More instructions for README.md
2012-01-26 07:29:46 -08:00
11ba724508
Still trying to get please db parameters correct
2012-01-25 17:19:28 -08:00
Raymond Yee
eric
Andromeda Yelton
Jason
Ed Summers
Raymond Yee
icellama21