Commit Graph

382 Commits (d1951bab75ef93878e11bcdcc57cfac62580098c)

Author SHA1 Message Date
Raymond Yee 61fe8125e9 turn debugging on for localvm
needed a new key/secrete for facebook login
2015-07-03 11:06:54 -07:00
Raymond Yee cb55b83090 using xip.io to map a test server URL.
specifically 192.168.33.10.xip.io
2015-07-03 11:06:54 -07:00
Raymond Yee c759ee8a73 pass 2 on localvm 2015-07-03 11:06:54 -07:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
Raymond Yee 08cfd613c2 reconciled the mysql parameters in just with production/please and add first draft of ansible playbook for just 2015-05-18 12:38:09 -07:00
Raymond Yee cb0c647d1a * making progress on building please.unglue.it
* updating requirements_versioned.pip to handle Pyzotero
2015-05-04 10:51:12 -07:00
Raymond Yee bc0e753d44 facebook credentials for just 2015-04-16 15:59:19 -07:00
eric 7715551671 fix auth pipeline classes 2015-04-15 10:50:36 -04:00
Raymond Yee 66b6a73acd facebook keys for just 2015-04-10 17:36:31 -07:00
Raymond Yee b61a4a0e0c 1) updated settings/dev.py to reflect new parameters needed for python-social-auth
2) added an IPython notebook to run Selenium test
2015-04-10 16:05:12 -07:00
eric 6ef8e7699d update credentials 2015-04-09 13:28:03 -04:00
eric 97579bda71 re-establish un length limit 2015-04-09 12:41:00 -04:00
eric e87294d442 twitter and facebook settings 2015-04-09 11:44:48 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
eric ad2017e054 update press page 2015-01-02 00:33:32 -05:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
Raymond Yee a391826e5c increase recharge_window from 7 to 14 days to allow people more time 2014-10-19 16:30:59 -07:00
eric 29baf69d3c record spitting now works 2014-10-17 22:48:51 -04:00
eric be294aa8f0 Merge branch 'master' into stub-marc 2014-10-17 11:36:35 -04:00
Raymond Yee b847771089 First pass at trying to fix problems in pip install -r requirements 2014-10-16 15:12:34 -07:00
eric fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
Raymond Yee 4b36988115 Turn on a daily test email from production and just -- to give RY some daily ping about celerybeat 2014-10-10 12:39:43 -07:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
eric de6b8555d1 move CC constants into a module 2014-05-08 10:21:50 -04:00
Raymond Yee f5fdcb17cd I'd like to have locals.py as the last item in the file 2014-05-02 11:19:05 -07:00
eric ac7d77965d our production account 2014-05-02 14:14:44 -04:00
Raymond Yee 58896c9b2b updating bucket name on unglue.it 2014-02-19 17:22:45 -08:00
Raymond Yee b8aaab0d4c Setting up jenkins-unglueit S3 bucket for jenkins 2014-02-19 15:24:23 -08:00
Raymond Yee 41bbe5bac5 just_unglueit -> just-unglueit bucket name 2014-02-19 15:16:17 -08:00
Raymond Yee 854bc28612 registered a new Google Books API for jenkins under rdhyee@gluejar.com account 2013-12-10 14:48:04 -08:00
eric 188d34ea51 added test for b2u ungluify
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
Raymond Yee d3a784812c drop emit_notifications from celery right now since we're using crontab for now 2013-11-12 06:40:34 -08:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
eric 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
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
Raymond Yee 3b34c43581 Merge branch 'insert_dated_copyright' 2013-09-20 18:00:30 -07:00
Raymond Yee 8543a9ac2f change pyepub to regluit.pyepub 2013-09-20 17:59:40 -07:00
Raymond Yee 2143d5854f Merge branch 'master' of github.com:Gluejar/regluit 2013-09-20 17:52:48 -07:00
Raymond Yee 78a7d69513 Add pyepub to installed modules 2013-09-20 17:51:58 -07:00
eric e075fd0081 not using unglueit.com any more 2013-09-11 13:43:49 -04:00
Raymond Yee 6b4898c700 for now add s3 keys to jenkins -- ideally, we should set up separate keys 2013-08-30 12:13:44 -07:00
eric 55d84deaf9 not sure why this problem didn't surface before... 2013-08-30 14:17:45 -04:00
Raymond Yee 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
eric e5a162061d only epub files to be uploaded for now 2013-08-26 23:54:19 -04:00
eric 10b975b839 initial commit 2013-08-23 17:14:48 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric 587323196a Merge branch 'master' into ebook_selling 2013-08-08 20:02:25 -04:00
eric 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
eric 69f9e1838f harmonization with master for merge 2013-08-08 18:21:33 -04:00
Raymond Yee 27bc134fa4 Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc 2013-08-08 12:28:36 -04:00
Raymond Yee a9b5d51b36 Merge branch 'master' into expiring_cc 2013-08-07 22:59:37 -04:00
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