EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,984 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

4984 Commits (9e24dfaf7d922841253d1a7f117c12d0fc768b41)

Author SHA1 Message Date
eric 9e24dfaf7d change all signin buttons to bootstrap buttons 2015-04-08 23:32:36 -04:00
eric d695769a3c add fontawesome fonts 
from https://github.com/FortAwesome/Font-Awesome/tree/v4.3.0
 2015-04-08 23:31:22 -04:00
eric 8d1f911726 add bootstrap mix-ins 
from bootstrap v3.3.4
https://github.com/twbs/bootstrap/commit/4127b250db461e47639983e2ad17796
3316386e1
 2015-04-08 23:28:52 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
Raymond Yee d5291b6f89 Merge pull request #454 from Gluejar/mobigen_integrate 
Mobigen integrate
 2015-04-03 10:06:11 -07:00
Raymond Yee 53a37b1b31 Merge branch 'master' into mobigen_integrate 2015-04-03 10:05:02 -07:00
Raymond Yee fda236190f Merge pull request #472 from Gluejar/metrics_nits 
Metrics nits
 2015-03-31 12:26:05 -07:00
eric 27af1780ab month summary was including previous year 2015-03-31 13:51:22 -04:00
eric 78c2bb2dfc add free count 2015-03-31 13:50:39 -04:00
Raymond Yee 4d6fd00b12 Merge pull request #471 from Gluejar/fix_ebook_admin 
empty filesize was an issue for admin
 2015-03-24 13:03:58 -07:00
eric 5d87f72e3b empty filesize was an issue for admin 2015-03-24 13:13:31 -04:00
Raymond Yee 85d057eb7d Merge pull request #469 from Gluejar/improve_redemption 
add case for correct user already has redeemed
 2015-03-19 10:41:31 -07:00
Raymond Yee 8c7d99c8d7 Merge pull request #468 from Gluejar/subject_mapping 
add keyword mapping
 2015-03-19 10:37:05 -07:00
Raymond Yee afb6885572 added comment line with example for subject/onto_subject 2015-03-19 10:34:26 -07:00
Raymond Yee 4af89a8f38 Merge pull request #470 from Gluejar/google_books_button 
returned gbooks  thumbnail urls have changed [fixes #90634336]
 2015-03-18 12:09:00 -07:00
eric 1739e94177 returned gbooks thumbnail urls have changed 2015-03-18 14:59:38 -04:00
Raymond Yee b108e6fcb1 Merge pull request #464 from Gluejar/google_books_button 
cleanup search page issues
 2015-03-18 11:58:47 -07:00
Raymond Yee ee7f366e7d update version of selenium used to test locally 2015-03-18 11:57:28 -07:00
Raymond Yee 9d2b343c74 Merge branch 'google_books_button' of github.com:Gluejar/regluit into google_books_button 2015-03-18 11:36:49 -07:00
eric 8ac6d03723 off by one error 2015-03-18 14:34:58 -04:00
Raymond Yee eb034013eb Merge branch 'master' into google_books_button 2015-03-18 11:20:28 -07:00
eric e76bb39069 add case for correct user already has redeemed 2015-03-17 22:11:55 -04:00
eric 519cad0083 add sanity check 
usually you don't want to add a broad category to a small one
 2015-03-12 12:25:03 -04:00
eric 576eb6d872 add keyword mapping 2015-03-12 11:58:49 -04:00
eshellman bbb206a685 Merge pull request #467 from Gluejar/improve_ssl 
Improve ssl configuration on production and just
 2015-03-11 16:56:39 -04:00
Raymond Yee 486e474fc3 Set the SSL configuration to that generated by 
https://mozilla.github.io/server-side-tls/ssl-config-generator/
intermediate mode
2015.03.04   (with Apache v 2.2.22 and OpenSSL 1.0.1 and HSTS enabled)
 2015-03-11 10:10:48 -07:00
Raymond Yee 949f22415b a modern configuration from https://mozilla.github.io/server-side-tls/ssl-config-generator/ 2015-03-10 16:07:15 -07:00
Raymond Yee 76738fec97 Merge branch 'master' into improve_ssl 2015-03-10 15:50:09 -07:00
Raymond Yee cdb84dfffa Working conclusion: use the configuration: 
SSLProtocol             all -SSLv2 -SSLv3
SSLCipherSuite          ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
SSLHonorCipherOrder     on
 2015-03-10 15:48:02 -07:00
Raymond Yee 99350d6cc4 Merge pull request #466 from Gluejar/fix_ebook_add 
Fix ebook add
 2015-03-10 12:39:38 -07:00
eric 3bdec13270 display ebook errors for first ebook 2015-03-10 14:19:05 -04:00
eric c3896b70d4 allow ebook creation without filesize 2015-03-10 14:18:34 -04:00
Raymond Yee d6a2c54fac Merge pull request #462 from Gluejar/kindle_file_size 
Kindle file size
 2015-03-09 12:12:01 -07:00
Raymond Yee b0550999e1 incorporate changes from kindle safe title changes. 
Merge branch 'master' into kindle_file_size

Conflicts:
	frontend/views.py
 2015-03-09 10:56:20 -07:00
Raymond Yee c9fd007654 Merge pull request #461 from Gluejar/warn_kindle_address 
flag kindle email addressed that don't contain "kindle" in them
 2015-03-09 10:14:12 -07:00
Raymond Yee d5c7b00d7c Merge pull request #465 from Gluejar/fix_kindle_bugs 
add comment about what fix_kindle_bugs does
 2015-03-06 15:17:44 -08:00
Raymond Yee 71c8a95b90 add comment about what fix_kindle_bugs does 2015-03-06 15:16:04 -08:00
Raymond Yee 387c8d43e2 Merge pull request #460 from Gluejar/fix_kindle_bugs 
provide a title that's kindle-safe
 2015-03-06 15:06:21 -08:00
eric 8fd3e88622 don't need ungluer list for search 
javascript was trying to download user avatars even when they're not in
the results
 2015-03-06 17:35:16 -05:00
eric 351b9df768 add link that triggers the Google Books search 2015-03-06 17:28:21 -05:00
Raymond Yee af7c61ac13 Merge pull request #463 from Gluejar/news_update 
update news link
 2015-03-06 14:01:28 -08:00
eric c442861322 fix javascript bugs 2015-03-06 17:00:07 -05:00
eric a444055912 inline endless scroll for better performance 2015-03-06 16:59:20 -05:00
eric 355e50b297 update news link 2015-03-06 16:32:21 -05:00
eric 0c4550fe4a save ebook file size on send_to_kindle 
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
 2015-03-05 22:30:03 -05:00
eric 5057820f30 update for mac yosemite 2015-03-05 22:26:25 -05:00
eric 94d9571e25 flag kindle email addressed that don't contain "kindle" in them 
only valid kindle addresses we've seen not in kindle.com domain are
kindle.cn. Wanted to allow other addresses just in case.
 2015-03-05 17:35:55 -05:00
Raymond Yee 2e274b4e2b config without RC4 
://community.qualys.com/blogs/securitylabs/2013/08/05/configuring-apache-nginx-and-openssl-for-forward-secrecy
 2015-03-05 12:30:47 -08:00
Raymond Yee 8506df2480 need "" around ciphers 2015-03-05 12:26:40 -08:00
Raymond Yee 2685940069 ooops typo 2015-03-05 12:25:34 -08:00