329d35590a
'email_change' -> 'regluit.email_change'
2013-03-26 10:58:49 -07:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
5229af0e3f
session cookie from 2 weeks to 6 weeks
2013-03-21 10:13:32 -04:00
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
f4f326ace8
Merge pull request #147 from Gluejar/fix_twitter_auth
...
update social auth and django to fix broken twitter auth
2013-03-15 15:48:37 -07:00
f719fb2ec3
migrate to pipeline
2013-03-15 12:29:11 -04:00
c93762b8ee
update social auth and django
...
before this can be installed on an existing database, the following
south command must be applied:
django-admin.py convert_to_south social_auth
2013-03-14 23:46:01 -04:00
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
131010300a
std install of email_change
...
decided not to use pip install because the code needs some mods, and
doesn't seem to be maintained.
2013-03-12 20:45:09 -04:00
7dc1f4cba3
Merge pull request #129 from Gluejar/manager_supporter_msgs
...
Managers and staff can send messages to supporters [#36991391 ]
2013-03-12 11:52:43 -07:00
c037764289
sitemaps! [ #25581139 ]
2013-03-09 17:37:33 -05:00
d3077c988b
links should not point to http from https
2013-03-09 13:29:03 -05:00
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
a56222426e
set queueing to use the master switch
...
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
de96aa0755
Add task for 22nd of month for notifying expring cc
2013-03-04 11:19:13 -08:00
474c959fcf
check for Account.status changes on just and production
2013-03-04 10:29:53 -08:00
902c3e837a
define a celery task for the 1st of each month to update the status of each Account
...
right now, I recalculate the status of each account -- but it is probably better to look only at the issue of dates -- another revision coming up.
2013-03-01 14:43:43 -08:00
95bf4d8ba9
Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage
2013-02-11 11:28:13 -08:00
4f46760ab9
Remove prefix for CKEDITOR uploading on production
2013-02-11 11:24:32 -08:00
e1318b5d1e
Don't have any directory prefixes for CKEDITOR uploading in just
2013-02-11 19:18:16 +00:00
ccb331c6ff
Put in S3 keys for just and production
2013-02-11 10:47:03 -08:00
a6eee0b854
1) use our custom django-ckeditor which tries to integrate django-storages: git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge
...
2) set in common.py placeholders for parameters needed by django-storages for S3
2013-02-08 09:57:23 -08:00
f7cea12e12
settings for using django-storages and s3boto
2013-02-04 12:33:57 -08:00
415aa84878
Added CKEDITOR_UPLOAD_PREFIX = ' https://unglue.it/static/media/ ' to prod.py
2013-02-04 07:58:26 -08:00
130478ca57
Added CKEDITOR_UPLOAD_PREFIX
2013-01-30 06:07:50 +00:00
c1c3b3d1ad
[ #40818125 ] minimum target to $500
2012-12-06 21:05:15 -05:00
bf23675f5c
get rid of PAYMENT_PROCESSOR setting in jenkins.py
2012-11-27 13:09:45 -08:00
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
84e13a42bf
scheduling ending soon notification
2012-11-21 11:09:18 -05:00
a90f133166
First pass at writing a signal handler to recharge transaction if account updated
2012-11-12 11:22:20 -08:00
673b890e42
add production setting and only use google analytics in production
2012-10-23 10:24:16 -04:00
603b2dacf9
set IS_PREVIEW on jenkins
2012-10-15 08:55:44 -07:00
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
Raymond Yee
eric
thatandromeda
Jason
Ed Summers
Raymond Yee