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
63ce2a3487
Trying a user please2 which doesn't require SSL
2012-01-25 17:16:53 -08:00
f626ecc772
I had to change the instance again.
2012-01-25 15:40:43 -08:00
bb257451e4
Updated setting for please
2012-01-25 14:31:10 -08:00
f7e8e41c71
First round of having debug URLs available only if not in preview mode
2012-01-18 09:08:34 -08:00
0d2b7e0c12
change site id to unglue.it
2012-01-15 23:24:09 +00:00
9b9a1e80d5
fix BASE_URL for paypal
2012-01-15 18:11:53 -05:00
339235363a
production facebook app
2012-01-15 23:04:32 +00:00
8bffcbc308
production config changes
2012-01-15 22:14:45 +00:00
61f9ff9980
forked please and prod configurations
2012-01-15 20:37:08 +00:00
f7a042c9ef
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-15 14:57:18 -05:00
c6f2e0b531
one more thing to display for preview only
2012-01-15 14:56:26 -05:00
2508d1308e
preview explore
2012-01-15 14:56:17 -05:00
f80226fe5e
minor additions to the press page, plus new users now go to supporter page on login
2012-01-12 13:57:50 -05:00
c2789350d0
We have comments! sync your dbs.
2011-12-30 22:08:04 -05:00
1ddbbf55a5
now there is a truncatechars filter, applied where relevant
2011-12-29 12:50:09 -05:00
f493312782
Revert "added htmlbase to enforce https login"
...
This reverts commit 93afadcf46
2011-12-28 13:51:24 -05:00
93afadcf46
added htmlbase to enforce https login
2011-12-28 12:34:43 -05:00
37a0139e8d
registration and profile cleanup / decrufting
2011-12-28 12:34:42 -05:00
697ee04a43
added site fixtures to make email registration emails work
2011-12-28 12:34:41 -05:00
c055767173
set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days.
2011-12-20 14:56:01 -05:00
aab7b6f926
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 10:35:42 -05:00
5a5ca2262e
adding TEST_RUNNER back in with latest djcelery test runner djcelery.contrib.test_runner.CeleryTestSuiteRunner to avoid deadlock when running tests
2011-12-20 09:45:10 -05:00
b22d8a82c5
removed TEST_RUNNER declaration since djcelery.contrib.test_runner.run_tests no longer seems to exist in latest djcelery package. not really sure why it was there in the first place.
2011-12-20 09:15:57 -05:00
bad343e3d2
views.py: wiring in the email address of partnering non-profit
...
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
34dd5237af
merged with raymond's commit
2011-12-02 19:37:27 -05:00
dd6add1e44
Implemented WorkListView- does popular and recommended lists
2011-12-02 19:29:23 -05:00
1fc644aacd
implemented a minimum campaign term; other campaign management tweaks
2011-11-29 10:48:37 -05:00
b3d7a7835f
http:/please.unglueit.com -> http://please.unglueit.com in prod.py
2011-11-28 10:27:20 -08:00
d5bae40c00
refactored launchable into campaign model. fixed date camparison bug. moved target and deadline limits to settings file
2011-11-23 21:41:06 -05:00
a9ab0e45e6
adding more debugging info about Paypal PAY and PREAPPROVAL
...
Getting rid of final '/' in prod.py: BASE_URL
2011-11-23 09:41:11 -08:00
b08b489daf
One more try at setting BASE_URL....maybe you do need the ending '/'
2011-11-22 16:57:54 -08:00
9812008a36
Need to set BASE_URL to allow PayPal IPN to be handled on please
2011-11-22 16:21:38 -08:00
8e3bd56557
Setting PAYPAL_GLUEJAR_EMAIL -- the missing value might have the reason why Paypal not working on please
2011-11-22 16:03:05 -08:00
242b2a67c7
Putting Raymond's sandbox Paypal credentials into prod.py to see whether PayPal sandbox functionality will work on please
2011-11-22 14:31:20 -08:00
8008a5df51
added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page
2011-11-21 20:12:13 -05:00
d3d059b1b7
trying local mysql
2011-11-21 15:08:44 -05:00
3b777f87aa
allow empty publication date, also make sure test database uses charset utf8 or else tests will fail
2011-11-21 14:13:29 -05:00
b9b99b4b34
lets try putting the mysql hostname in there
2011-11-21 12:45:58 -05:00
20d7751c96
going to switch jenkins to use mysql
2011-11-21 12:38:24 -05:00
1189ab02c4
switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit)
2011-11-20 14:22:51 -05:00
43f1d9cdeb
settings.prod now set to use accounts@gluejar.com mail account
2011-11-20 09:51:19 -05:00
f193ea396e
use local mailserver instead of google mail ; also now routing all /admin and /accounts traffic through ssl
2011-11-20 02:48:26 +00:00
08dd93afdf
django.contrib.admin must appear after regluit.frontend in INSTALLED_APPS or else the registration templates are found there instead of in frontend/templates/registration
2011-11-19 15:10:10 -05:00
04c87244a2
thought i had it figured out why admin was stomping on accounts/password/change/ but I did not ... sigh
2011-11-19 12:34:38 -05:00
7dd821fccb
enabling admin, and added created column on models that did not have them
2011-11-19 11:55:35 -05:00
bb4bf65a9d
disable admin until we can figure out why it overrides /accounts/password/change/
2011-11-18 17:03:52 -05:00
5a70d967e9
added info about collecting static files for production environment
2011-11-18 16:37:05 +00:00
f103e56c4b
enabling admin
2011-11-18 10:41:10 -05:00
6cc05817a8
woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable
2011-11-18 09:24:31 -05:00
6a9a213632
added pagination with django-endless-pagination
2011-11-17 23:09:23 -05:00
f119c7f3a7
starting fresh with migrations
2011-11-17 23:05:01 +00:00
5c8f2c5586
Putting in a key in jenkins.py for Goodreads
2011-11-16 13:33:10 -08:00
64829259fc
Added a setting for debug_toolbar
2011-11-16 13:00:51 -08:00
5df81cc52e
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-16 11:58:39 -08:00
3be4e6fab4
First pass at integrating LT into the UI
2011-11-16 10:20:10 -08:00
e90b168e71
added new db account for please
2011-11-16 04:15:01 +00:00
45f58ae955
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-15 10:37:19 -08:00
8478f3c4a7
rights holder tools now lists platform agreements that user administers; rights@gluejar.com is now an admin account
2011-11-15 10:01:01 -05:00
40d95acab4
added andromeda and eric to django admins
2011-11-14 16:36:38 +00:00
db3163b01b
added twitter account association and profile image acquisiton
...
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
2e00f6bbd0
added facebook association
2011-11-12 13:58:31 -05:00
dbea4ebb7a
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-11 17:34:46 -05:00
08053cc4ba
added my goodreads api key for please.unglueit.com
2011-11-11 17:33:58 -05:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
11e441da09
Merge branch 'master' into goodreads
2011-11-09 10:38:13 -08:00
eric
Raymond Yee
Andromeda Yelton
Jason
Ed Summers
Raymond Yee
icellama21