314847459b
remove readmill, add dropbox
2014-05-20 12:19:34 -04:00
de6b8555d1
move CC constants into a module
2014-05-08 10:21:50 -04:00
188d34ea51
added test for b2u ungluify
...
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
ab473f5411
libraries, phase 1.
...
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
8543a9ac2f
change pyepub to regluit.pyepub
2013-09-20 17:59:40 -07:00
78a7d69513
Add pyepub to installed modules
2013-09-20 17:51:58 -07:00
55d84deaf9
not sure why this problem didn't surface before...
2013-08-30 14:17:45 -04:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
10b975b839
initial commit
2013-08-23 17:14:48 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
587323196a
Merge branch 'master' into ebook_selling
2013-08-08 20:02:25 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
69f9e1838f
harmonization with master for merge
2013-08-08 18:21:33 -04:00
27bc134fa4
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
2013-08-08 12:28:36 -04:00
a9b5d51b36
Merge branch 'master' into expiring_cc
2013-08-07 22:59:37 -04:00
6da8d16770
moved the payment tasks to payment from core
2013-08-03 18:42:33 -04:00
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
1414ae5fa4
add user preference for MARC record link target
2013-07-23 09:53:07 -04:00
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07:00
2ea00389b3
minimal MARC support in database
2013-07-08 10:03:22 -04:00
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
1ee2d5c634
add a special response for failed social auths
2013-04-09 00:05:31 -04:00
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
8366b08c69
get email_change working again
2013-03-27 17:57:08 -04:00
df443b41a5
Revert "'email_change' -> 'regluit.email_change'"
...
This reverts commit 329d35590a
2013-03-27 15:03:30 -04:00
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
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
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
c1c3b3d1ad
[ #40818125 ] minimum target to $500
2012-12-06 21:05:15 -05: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
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
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
eric
Raymond Yee
Andromeda Yelton
Raymond Yee