Commit Graph

5215 Commits (27d4a354dbdf21fc625175619067cd9c8cb20a3a)

Author SHA1 Message Date
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
eric 088bdff782 fix add_author 2015-07-27 23:20:30 -04:00
eric 50429e4f1b migrate model
add through relation to authors
add authority code to subjects
2015-07-27 16:22:04 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
Raymond Yee 8438348ac6 Merge pull request #499 from Gluejar/fix_newuser_redirect
add redirect for new users
2015-07-09 13:51:56 -07:00
Raymond Yee 21e6cc2e54 updates to versions of selenium used to run tests 2015-07-09 13:47:50 -07:00
eric f19a1551e4 add redirect for new users 2015-07-09 16:32:52 -04:00
Raymond Yee ab40e5ec7c Merge pull request #498 from Gluejar/django_1.4.21
upgrading to Django 1.4.21
2015-07-09 13:04:15 -07:00
Raymond Yee 8ba4e9446e upgrading to Django 1.4.21 should be simply a matter of changing the requirements file. *fingers crossed*
https://docs.djangoproject.com/en/1.8/releases/1.4.20/
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
2015-07-09 12:15:18 -07:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee e147b3fea6 Merge pull request #494 from Gluejar/catch_stk_timeouts
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
Raymond Yee 9ffb96559b rewrote the mock ebook to make the logic behind it clearer 2015-07-08 13:31:35 -07:00
Raymond Yee b29f1af8a1 wire localvm into Vagrantfile 2015-07-06 16:44:55 -07:00
Raymond Yee b5be9f5431 Merge pull request #496 from Gluejar/sysadmin
latest updates in ongoing work to automate unglue.it setup
2015-07-06 15:19:59 -07:00
Raymond Yee 0fbb4f702c work in progress on parameterizing config_name 2015-07-03 11:06:55 -07:00
Raymond Yee dd367e39ff first pass at using roles w/ localvm 2015-07-03 11:06:54 -07:00
Raymond Yee eb0f51f1b7 make apache config 2.2 and 2.4 compatible 2015-07-03 11:06:54 -07:00
Raymond Yee e04ad9e915 changes to make things work for trusty64 on localvm 2015-07-03 11:06:54 -07:00
Raymond Yee e609313113 for some reason authorized_keys being skipped 2015-07-03 11:06:54 -07:00
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 56a5c17f1c trying localvm.test as a test domain 2015-07-03 11:06:54 -07:00
Raymond Yee 55ec76d283 forgot localvm.wsgi
fix apache config file to hopefully do redirect correctly -- hardcoding localvm as a name for the address for localvm vm.
2015-07-03 11:06:54 -07:00
Raymond Yee c8f39d9a7f fix security group setting for please
add setup_django_localvm.sh
2015-07-03 11:06:54 -07:00
Raymond Yee 426d9e126f name of localvm apache config 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 7d76df7007 first pass at localvm 2015-07-03 11:06:54 -07:00
Raymond Yee c5466e9f0c add github key to jenkins known_hosts 2015-07-03 11:06:54 -07:00
Raymond Yee 685229ae4c Merge pull request #495 from Gluejar/fix_subjects_template
forgot about admin urls
2015-07-03 09:50:53 -07:00
eric 741763e8b6 handle connection timeout 2015-07-01 22:07:04 -04:00
eric df2706993d mock ebook for stk 2015-07-01 22:06:33 -04:00
eric 13093c9c4b forgot about admin urls
when updating url tag syntax
2015-07-01 20:57:25 -04: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 aa714252b1 Merge pull request #493 from Gluejar/improve_search
improve search results page
2015-06-16 12:40:37 -10:00
eric f1c74fe7da made search easier
when no local results, automatically invoke google books search
2015-06-07 18:55:49 -04:00
Raymond Yee 030e914277 Merge pull request #492 from Gluejar/referrer_policy
eliminate referrer leakage
2015-06-04 14:47:24 -07:00
eric e6eaa24440 eliminate referrer leakage 2015-06-04 15:15:59 -04:00
Raymond Yee 90df82954e Merge pull request #491 from Gluejar/handle_bad_ebook_links
handle the bad link error  (Se test run locally -- so at the very least, this PR should not be destabilizing...will deploy and then test on some links.)
2015-06-03 07:24:03 -07:00
Raymond Yee 6ec36e001d adding a colon to error message
"Well, this is awkward our ebook link is bad" to "Well, this is awkward: our ebook link is bad"
2015-06-03 07:02:49 -07:00
eric 499b67d3e1 handle the bad link error 2015-06-02 23:45:30 -04:00
Raymond Yee a167c5ad08 Merge pull request #490 from Gluejar/fix_bookloader_test
sample book (temporarily) not recognized by Google Books API
2015-05-27 12:38:56 -07:00
Raymond Yee bb74261013 sample book (temporarily) not recognized by Google Books API 2015-05-27 12:37:47 -07:00
Raymond Yee ae4180b119 Merge pull request #489 from Gluejar/sysadmin
added command to fix up jenkins known_hosts
2015-05-18 16:41:36 -07:00
Raymond Yee f7962c4db4 added command to fix up jenkins known_hosts 2015-05-18 16:39:14 -07:00
Raymond Yee d1dea336ee Merge pull request #488 from Gluejar/sysadmin
reconciled the mysql parameters in just with production/please
2015-05-18 12:41:14 -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
eshellman eef91ad072 Merge pull request #487 from Gluejar/sysadmin
vagrant setup for just
2015-05-17 13:43:45 -04:00
Raymond Yee db3c790bcb next iteration on getting just running 2015-05-16 13:30:09 -07:00
Raymond Yee 8f3051ffd3 get rid of public keys for Andromeda, Ed, and Jason 2015-05-16 13:30:09 -07:00