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
4860ec430a
added script to update please.unglueit.com
2011-11-09 18:22:23 +00:00
96939b59b7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
settings/dev.py
2011-11-08 09:51:27 -08:00
a40cab0184
First take on integrating pledge
2011-11-07 16:01:08 -05:00
83b7bed56e
introduce a setting to allow Celery messages to go to regular Python log
2011-11-06 18:32:43 -05:00
323856b0c1
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 15:09:17 -05:00
dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05:00
68b4da17d1
Some code for OpenLibrary, Freebase, HathiTrust to explore the nature of the data available in those sources
2011-11-06 07:55:07 -05:00
9a6a3d260a
Adding unique tracking ID to paypal payments
2011-10-27 02:35:46 -04:00
809517e99a
Ooops...forgot other files I had actually changed.
2011-10-24 18:29:01 -07:00
9901408b00
added list of supporters to the work page, just as a proof of concept more than anything.
2011-10-20 18:16:42 +00:00
b1526ea284
Merge branch 'master' into tastypie2
...
Conflicts:
core/models.py
2011-10-20 10:00:45 -07:00
11e75cb0a9
added celery config for jenkins
2011-10-20 05:19:19 +00:00
dbcd8e3465
use redis in production environment for pub/sub instead of polling
2011-10-20 05:18:04 +00:00
a79de596bb
added production deployment information and scripts for celeryd
2011-10-20 04:36:41 +00:00
0c1411f2e8
added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend
2011-10-19 23:31:16 -04:00
0ed1d229f5
Updating campaign widget to show status and progress. Don't have a way to calculate a graphic representation of progress yet.
2011-10-19 09:45:25 -07:00
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
8d27cfc89e
Merge branch 'master', remote branch 'origin' into payment_integration
2011-10-18 07:43:42 -07:00
cd805d14ab
added raymond to the admins who get emailed with exceptions
2011-10-17 18:06:11 +00:00
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
a621f9f2d9
turning off debug for prod settings
2011-10-14 20:37:44 +00:00
e8c8f2dfc2
Got rid of a lot of code that was there to help RY learn about class based generic views.
...
Inserted a setting for the Gluejar paypal account email.
2011-10-13 19:16:28 -07:00
030f2fbae7
needed to start over with clean slate for migrations since they were not being run as part of test suite, which was covering up some errors in the migrations
2011-10-10 22:31:24 -04:00
89277a5e34
use textfield instead of charfield(10000) since Amazon RDS does not like them
2011-10-10 20:40:19 +00:00
f701cda168
need a jenkins settings file with a googlebooks api key for the tests to pass
2011-10-10 13:26:00 -04:00
d7f2101166
production apache and mod_wsgi configs
2011-10-07 03:14:29 +00:00
59ba9db4f6
Adding basic selenium powered unit tests for payments
2011-10-04 07:55:39 -04:00
8175ea14f8
django-jenkins seems to use a whole lot of cpu and memory on ec2, to the point where it gets killed sometimes :-(
2011-10-04 01:03:12 -04:00
bc67cf937b
try running regluit tests only w/ django-jenkins
2011-10-03 23:57:57 -04:00
87d93ad915
going to try out django-jenkins management command
2011-10-03 23:33:12 -04:00
a4344e0afa
didn't need django-profiles at all, Sorry!
2011-10-03 17:39:54 -04:00
73c4ebde29
allow username setting and tagline in profile
...
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
76e3b193d7
fixed failing tests related to interplay between django_extensions and south
2011-09-29 21:57:12 -04:00
9a44cfc436
added remove from wishlist
2011-09-29 11:44:03 +00:00
37b46d01c2
Adding pledge payment support
2011-09-27 08:48:11 -04:00
85079fd559
removed facebook and twitter from django-socialauth login/registration
2011-09-18 19:45:23 -04:00
9608f8efcb
working starter API for Work
2011-09-12 13:02:06 -07:00
2c7f858125
handle duplicates using openlibrary ids for edition, work and author
2011-09-10 11:36:38 +00:00
0f5ff789ff
lots of changes to support dynamically loading from openlibrary based on an isbn...which still needs some work to prevent duplication
2011-09-09 01:38:28 -04:00
7ec16e58c3
Merge branch 'master' of github.com:Gluejar/regluit
2011-09-07 05:34:20 -04:00
ded6c1719f
oops, should not have my real google key in here
2011-09-07 05:33:05 -04:00
e89f02bb13
unfortunate there are no TWITTER_EXTENDED_PERMISSIONS, and we cannot get an email address from them it seems :(
2011-09-06 04:13:24 +00:00
0ce0369792
small style changes, and signal to update email if available from facebook
2011-09-06 03:50:38 +00:00
4e3ae05990
added details about logins via twitter, facebook and google
2011-09-06 01:50:55 +00:00
9e98be5b37
added django-social-auth for logins w/ google, twitter and facebook
2011-09-05 21:04:49 -04:00
b7ae2146c4
got the menu bar changing when a user is logged in again
2011-09-04 01:29:18 -04:00
98301544a8
removed gmail credentials and modified the installation to give instructions for creating a settings.me settings module where you can put your gmail credentials, which will not be put in git
2011-09-04 01:04:04 -04:00
6bd5824fc4
introduced django-registration for user management
2011-09-04 00:21:51 -04:00
139a866bf6
setup api, core and frontend apps, also added initial homepage template from stefan
2011-08-30 23:46:55 -04:00
Ed Summers
Raymond Yee
Raymond Yee
eric
icellama21
Andromeda Yelton
Jason