Raymond Yee
f30d662cd9
Merge branch 'master' into marc_provision
2013-08-07 22:10:01 -04:00
eric
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
eric
6da8d16770
moved the payment tasks to payment from core
2013-08-03 18:42:33 -04:00
eric
f2fbfed79e
Merge branch 'master' into expiring_cc
2013-08-03 16:19:53 -04:00
eric
84c18ee65d
Make sure current staff is described accurately on ungluue.it site
2013-08-01 19:28:20 -04:00
eric
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
Andromeda Yelton
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
Andromeda Yelton
1414ae5fa4
add user preference for MARC record link target
2013-07-23 09:53:07 -04:00
eric
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
Andromeda Yelton
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
Andromeda Yelton
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
Raymond Yee
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07:00
Andromeda Yelton
2ea00389b3
minimal MARC support in database
2013-07-08 10:03:22 -04:00
Raymond Yee
63a3bac876
Trying a new key for prod.py too to see whether that will fix breakage in api calls
2013-07-02 07:37:12 -07:00
Raymond Yee
4333a480de
Testing out new Google Books API key on just
2013-07-02 07:24:18 -07:00
eric
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
Andromeda Yelton
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
Raymond Yee
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
eric
1ee2d5c634
add a special response for failed social auths
2013-04-09 00:05:31 -04:00
eric
fabc7e6802
merge from master again except views
2013-04-05 13:07:13 -04:00
Raymond Yee
25fedc69ee
get prod out of production mode
2013-03-30 10:25:32 -07:00
Raymond Yee
1f522e0112
maintenance mode
2013-03-30 09:47:45 -07:00
eric
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
eric
8366b08c69
get email_change working again
2013-03-27 17:57:08 -04:00
eric
df443b41a5
Revert "'email_change' -> 'regluit.email_change'"
...
This reverts commit 329d35590a
.
2013-03-27 15:03:30 -04:00
Raymond Yee
329d35590a
'email_change' -> 'regluit.email_change'
2013-03-26 10:58:49 -07:00
eric
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
eric
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
eric
5229af0e3f
session cookie from 2 weeks to 6 weeks
2013-03-21 10:13:32 -04:00
Raymond Yee
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
eric
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
eric
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
eric
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
Raymond Yee
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
eric
f719fb2ec3
migrate to pipeline
2013-03-15 12:29:11 -04:00
eric
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
eric
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
eric
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
thatandromeda
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
eric
c037764289
sitemaps! [ #25581139 ]
2013-03-09 17:37:33 -05:00
eric
d3077c988b
links should not point to http from https
2013-03-09 13:29:03 -05:00
eric
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
eric
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
eric
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
Raymond Yee
de96aa0755
Add task for 22nd of month for notifying expring cc
2013-03-04 11:19:13 -08:00
Raymond Yee
474c959fcf
check for Account.status changes on just and production
2013-03-04 10:29:53 -08:00
Raymond Yee
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
Raymond Yee
95bf4d8ba9
Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage
2013-02-11 11:28:13 -08:00
Raymond Yee
4f46760ab9
Remove prefix for CKEDITOR uploading on production
2013-02-11 11:24:32 -08:00
Raymond Yee
e1318b5d1e
Don't have any directory prefixes for CKEDITOR uploading in just
2013-02-11 19:18:16 +00:00
Raymond Yee
ccb331c6ff
Put in S3 keys for just and production
2013-02-11 10:47:03 -08:00
Raymond Yee
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
Raymond Yee
f7cea12e12
settings for using django-storages and s3boto
2013-02-04 12:33:57 -08:00
Raymond Yee
415aa84878
Added CKEDITOR_UPLOAD_PREFIX = ' https://unglue.it/static/media/ ' to prod.py
2013-02-04 07:58:26 -08:00
Raymond Yee
130478ca57
Added CKEDITOR_UPLOAD_PREFIX
2013-01-30 06:07:50 +00:00
eric
c1c3b3d1ad
[ #40818125 ] minimum target to $500
2012-12-06 21:05:15 -05:00
Raymond Yee
bf23675f5c
get rid of PAYMENT_PROCESSOR setting in jenkins.py
2012-11-27 13:09:45 -08:00
Raymond Yee
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
Andromeda Yelton
84e13a42bf
scheduling ending soon notification
2012-11-21 11:09:18 -05:00
Raymond Yee
a90f133166
First pass at writing a signal handler to recharge transaction if account updated
2012-11-12 11:22:20 -08:00
Andromeda Yelton
673b890e42
add production setting and only use google analytics in production
2012-10-23 10:24:16 -04:00
Raymond Yee
603b2dacf9
set IS_PREVIEW on jenkins
2012-10-15 08:55:44 -07:00
Raymond Yee
67c41df4b3
we have relaunched
2012-10-15 08:08:06 -07:00
eric
1c5500a4e1
set NONPROFIT.is_on to false for launch
2012-10-12 13:47:43 -04:00
Andromeda Yelton
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
Raymond Yee
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
Raymond Yee
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
Raymond Yee
2eb4ac3e56
Add TEST_COLLATION of utf8_bin to just
2012-10-01 17:05:03 +00:00
Raymond Yee
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
thatandromeda
99d4a3dd1c
need to be in preview mode until relaunch
2012-09-27 12:14:41 -03:00
Raymond Yee
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
Andromeda Yelton
adefc43154
first pass
2012-09-24 14:21:15 -04:00
eric
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
Raymond Yee
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
eric
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
eric
9ccfb4be48
Ed's tired of getting unglue.it bug reports
2012-09-05 11:17:36 -04:00
eric
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
eric
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
eric
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
eric
d72e905628
Revert "seeinggoogle account limits are the problem"
...
This reverts commit 1551be38bf
.
2012-07-12 09:03:58 -04:00
eric
1551be38bf
seeinggoogle account limits are the problem
2012-07-11 21:26:32 -04:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
Raymond Yee
0bd6fdeaa0
Moving production over to Amazon SES
2012-06-22 17:13:24 -07:00
Raymond Yee
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
Raymond Yee
feba1c2b7d
[ #31613287 ] temporary fix for SMTP limit -- switch to new account
2012-06-21 12:45:43 -07:00
Andromeda Yelton
63143bf860
removing rest of is_preview
2012-06-13 13:30:39 -03:00
Raymond Yee
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
Raymond Yee
b532a13bd0
Putting in MAINTENANCE_MODE for various local configurations
2012-05-17 13:56:44 -07:00
Raymond Yee
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
Raymond Yee
0ff30626bb
nuking UNGLUEIT_SHORTEST_DEADLINE from common.py
2012-05-17 09:06:19 -07:00
Raymond Yee
126e0f244e
Adding UNGLUEIT_SHORTEST_DEADLINE back
2012-05-17 08:34:46 -07:00
Raymond Yee
199921c015
Flipping IS_PREVIEW on production from True to False -- LAUNCHING
2012-05-17 08:21:51 -07:00
Raymond Yee
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
eric
36a5e92d25
[finish #29677811 ] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
2012-05-15 23:42:31 -04:00
Raymond Yee
942d80688a
Add secure IPN settings to prod.py
2012-05-15 17:42:16 -07:00
Raymond Yee
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
Jason
65a7df298d
Adding secure IPN url for amazon payments
2012-05-15 16:52:05 -04:00
Raymond Yee
c500b8dbaa
TURN ON FPS PAYMENT -- let's see what happens
2012-05-13 23:11:47 -07:00
eric
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
Raymond Yee
5cf4c17c33
Put in the right BASE_URL for production
2012-05-12 08:28:17 -07:00
Raymond Yee
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
Raymond Yee
50d6998a92
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
2012-05-12 08:06:51 -07:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
069342276b
Merge branch 'ry'
2012-05-09 18:04:56 -07:00
Raymond Yee
16bb539931
Put please into paypay mode
2012-05-10 00:50:31 +00:00
Raymond Yee
090d36de66
[ #29272807 ] implemented storage of FPS_* keys in the db
2012-05-09 17:16:49 -07:00
Raymond Yee
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
Raymond Yee
6c829a0556
Fix the BASE_URL for just
2012-05-08 16:21:13 +00:00
Raymond Yee
11c79b1f89
Add site number for just.unglueit.com
2012-05-07 12:06:59 -07:00
Ed Summers
04c9a46ede
Forgot to add settings/just.py
2012-05-07 19:05:58 +00:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
a62d988249
Merge branch 'ry' of github.com:Gluejar/regluit
2012-05-03 18:41:21 +00:00
Raymond Yee
3725094aea
A few more steps needed to get rid of billing (aka django-merchant)
2012-05-03 11:17:27 -07:00
Raymond Yee
d2dccbd1c3
add a PAYMENT_PROCESSOR setting to common.py
2012-05-02 18:34:13 -07:00
Raymond Yee
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
eric
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
eric
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
Raymond Yee
803a49e5d7
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-24 11:57:00 -07:00
Raymond Yee
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -07:00
Ed Summers
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
9a73decf78
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
2012-04-19 16:02:32 -07:00
Raymond Yee
929a70e498
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-04-19 12:58:13 -07:00
Ed Summers
9016331ed0
Changing to root password on please, which should be ok when please gets rebooted.
2012-04-19 18:40:46 +00:00
icellama21
03e9947189
Adding basic amazon FPS Pay function
2012-04-18 11:53:13 -04:00
Raymond Yee
c59923583b
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
settings/please.py
2012-04-18 08:13:38 -07:00
Raymond Yee
98cc04deb8
Turn off the spam Raymond
2012-04-17 14:07:14 -07:00
Raymond Yee
0969e05486
Test the spam raymond celerybeat task
2012-04-17 13:49:21 -07:00
Raymond Yee
f41265be6d
Turning on notification emission on please
2012-04-17 12:38:53 -07:00
Raymond Yee
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
Raymond Yee
11be270cfd
Added AWS parameters to various settings files
2012-04-11 09:53:20 -07:00
Raymond Yee
00511e4730
First pass at trying to integrate Amazon fps
2012-04-11 09:51:18 -07:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
8a0ed638d3
Add import regluit and datetime to common.py
2012-04-05 13:56:42 -07:00
Raymond Yee
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
Raymond Yee
2aae2f64c1
Added necessary import to settings -- datetime and regluit
2012-04-05 13:44:47 -07:00
Raymond Yee
b23f354029
Add the same celerybeat jobs configuration to production
2012-04-05 13:41:58 -07:00
Raymond Yee
22a5b19b56
Configure some jobs for celerybeat on please
2012-04-05 13:40:53 -07:00
Raymond Yee
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
Andromeda Yelton
883da1c873
Merge github.com:Gluejar/regluit
2012-03-29 16:28:04 -04:00
Andromeda Yelton
e4d98bd13e
context processors work better if you add them to settings
2012-03-29 16:26:22 -04:00
eric
62e5c4b518
this setting no longer used [ #27115145 ]
2012-03-29 16:14:44 -04:00
eric
30d7cbf1a9
either put the setting in common or the local settings, not both
2012-03-29 01:24:00 -04:00
Raymond Yee
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
eric
26eddf38fd
install notification
2012-03-27 11:52:23 -04:00
eric
51cf67dca7
moved transaction settings to common.py
2012-03-26 16:18:31 -04:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
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
eric
3cc1ab23de
account activation changed from 7 to 30 days
2012-03-03 17:26:50 -05:00
Andromeda Yelton
6b9c9a7653
changing version of jquery to 1.7.1
2012-02-14 11:28:48 -05:00
Andromeda Yelton
35d4fa4fd1
jquery back to local version for security reasons, only needed in common.py
2012-02-06 15:02:57 -05:00
Andromeda Yelton
7a94496c39
maybe the setting also needs to be in common to avoid breaking jenkins?
2012-02-06 14:29:47 -05:00
Andromeda Yelton
3c4d406a82
prod and please need to know about jquery_home and jquery_ui_home too
2012-02-06 14:14:09 -05:00
Andromeda Yelton
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
Raymond Yee
6ea55848bd
Merge branch 'master' into ry
2012-01-26 07:38:00 -08:00
Raymond Yee
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
Raymond Yee
11ba724508
Still trying to get please db parameters correct
2012-01-25 17:19:28 -08:00
Raymond Yee
63ce2a3487
Trying a user please2 which doesn't require SSL
2012-01-25 17:16:53 -08:00
Raymond Yee
f626ecc772
I had to change the instance again.
2012-01-25 15:40:43 -08:00
Raymond Yee
bb257451e4
Updated setting for please
2012-01-25 14:31:10 -08:00
Raymond Yee
f7e8e41c71
First round of having debug URLs available only if not in preview mode
2012-01-18 09:08:34 -08:00
Ed Summers
0d2b7e0c12
change site id to unglue.it
2012-01-15 23:24:09 +00:00
Raymond Yee
9b9a1e80d5
fix BASE_URL for paypal
2012-01-15 18:11:53 -05:00
Ed Summers
339235363a
production facebook app
2012-01-15 23:04:32 +00:00
Ed Summers
8bffcbc308
production config changes
2012-01-15 22:14:45 +00:00
Ed Summers
61f9ff9980
forked please and prod configurations
2012-01-15 20:37:08 +00:00
Andromeda Yelton
f7a042c9ef
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-15 14:57:18 -05:00
Andromeda Yelton
c6f2e0b531
one more thing to display for preview only
2012-01-15 14:56:26 -05:00
eric
2508d1308e
preview explore
2012-01-15 14:56:17 -05:00
Andromeda Yelton
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
eric
c2789350d0
We have comments! sync your dbs.
2011-12-30 22:08:04 -05:00
Andromeda Yelton
1ddbbf55a5
now there is a truncatechars filter, applied where relevant
2011-12-29 12:50:09 -05:00
eric
f493312782
Revert "added htmlbase to enforce https login"
...
This reverts commit 93afadcf46
.
2011-12-28 13:51:24 -05:00
eric
93afadcf46
added htmlbase to enforce https login
2011-12-28 12:34:43 -05:00
eric
37a0139e8d
registration and profile cleanup / decrufting
2011-12-28 12:34:42 -05:00
eric
697ee04a43
added site fixtures to make email registration emails work
2011-12-28 12:34:41 -05:00
Raymond Yee
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
Raymond Yee
aab7b6f926
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 10:35:42 -05:00
Ed Summers
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
Ed Summers
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
Raymond Yee
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
eric
34dd5237af
merged with raymond's commit
2011-12-02 19:37:27 -05:00
eric
dd6add1e44
Implemented WorkListView- does popular and recommended lists
2011-12-02 19:29:23 -05:00
eric
1fc644aacd
implemented a minimum campaign term; other campaign management tweaks
2011-11-29 10:48:37 -05:00
Raymond Yee
b3d7a7835f
http:/please.unglueit.com -> http://please.unglueit.com in prod.py
2011-11-28 10:27:20 -08:00
eric
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
Raymond Yee
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
Raymond Yee
b08b489daf
One more try at setting BASE_URL....maybe you do need the ending '/'
2011-11-22 16:57:54 -08:00
Raymond Yee
9812008a36
Need to set BASE_URL to allow PayPal IPN to be handled on please
2011-11-22 16:21:38 -08:00
Raymond Yee
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
Raymond Yee
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
Ed Summers
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
Ed Summers
d3d059b1b7
trying local mysql
2011-11-21 15:08:44 -05:00
Ed Summers
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