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
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
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -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
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
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
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
36a5e92d25
[finish #29677811 ] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
2012-05-15 23:42:31 -04:00
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04: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
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
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
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -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
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
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
e4d98bd13e
context processors work better if you add them to settings
2012-03-29 16:26:22 -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
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
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
37a0139e8d
registration and profile cleanup / decrufting
2011-12-28 12:34: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
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
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
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
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
45f58ae955
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-15 10:37:19 -08: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
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05: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
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
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
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
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
Andromeda Yelton
Raymond Yee
eric
Raymond Yee
Ed Summers
Jason