Commit Graph

6061 Commits (e161d28ee468f318187cd9291ae937760e08015a)

Author SHA1 Message Date
eric ada73a909c nits and tests 2017-08-03 17:09:42 -04:00
eric d5980bfd5b Merge branch 'master' into edit-editions 2017-08-03 16:15:14 -04:00
eric 08702a7b08 scrapes the metadata
also moves id validation to core
2017-08-03 16:15:06 -04:00
eric 7bc72692c5 add exception handling 2017-07-30 13:55:46 -04:00
eric 758e307516 Merge branch 'master' into edit-editions
# Conflicts:
#	frontend/tests.py
2017-07-29 20:47:28 -04:00
eric aaef670798 add scraper for webpages
gets title, description, language

adds beautiful soup to requirements
updates gitenberg.metadata import
2017-07-29 20:46:22 -04:00
eshellman 86b108364b Merge pull request #689 from Gluejar/fix-stripe-tests
Fix stripe tests again
2017-07-28 13:13:24 -04:00
eric b59ed38344 Fix stripe tests again 2017-07-28 13:13:18 -04:00
eric 05af45d13e delint 2017-07-28 12:45:17 -04:00
eshellman 075c2d7734 Merge pull request #688 from Gluejar/fix-stripe-tests
Fix stripe tests
2017-07-28 12:42:05 -04:00
eric f1dd40fe00 delint 2017-07-28 12:40:34 -04:00
eric a745223e3c fix brittle tests 2017-07-28 12:26:26 -04:00
eric 2adf3cc7cd handle isbn and goog lookups 2017-07-27 15:13:04 -04:00
eric db97a98ae8 https 2017-07-27 10:33:13 -04:00
eric 52127faec9 put id creation at start of new edition form
this reworks the identifier creation UI
2017-07-26 17:33:38 -04:00
eric d85a272576 reorg forms module 2017-07-25 09:28:14 -04:00
eric 85c4c3601c small refactor 2017-07-25 08:21:26 -04:00
eric 5c46c70fb1 delint and fix 2017-07-25 08:14:05 -04:00
eric d3eaf43228 start views reorg 2017-07-25 07:29:23 -04:00
eric 505f3c7db1 Merge branch 'master' into production 2017-07-19 15:59:41 -04:00
eshellman dbf687ba1d Merge pull request #687 from Gluejar/campaign-admin
Campaign admin usability
2017-07-19 15:22:45 -04:00
eric babe1a1152 also add EbookFileAdmin 2017-07-19 15:21:51 -04:00
eric 7aea18f39d make campaign admin usable 2017-07-19 14:27:07 -04:00
eric 3f9f84218e update admin style 2017-07-19 14:26:04 -04:00
eric 350a2a0ba2 Merge branch 'master' into production 2017-06-29 13:56:32 -04:00
eshellman 4ff6e33161 Merge pull request #686 from Gluejar/downloads-api
add publishers, ebooks to api
2017-06-29 13:26:56 -04:00
eric 7736201ce8 add publishers, ebooks to api 2017-06-29 13:22:58 -04:00
eric 078a04e34a Merge branch 'master' into production 2017-06-20 14:48:56 -04:00
eshellman 7d60ea8263 Merge pull request #685 from Gluejar/questionnaire-nit
remove old static folder
2017-06-20 14:48:15 -04:00
eric 699ef09728 remove old static folder 2017-06-20 14:47:29 -04:00
eric ed1f5b5693 Merge branch 'master' into production 2017-06-20 12:46:17 -04:00
eshellman 98e2e0797d Merge pull request #684 from Gluejar/use-fef-questionnaire
delete regluit.questionnaire
2017-06-20 11:36:48 -04:00
eric 4cc0e0fe4f delete regluit.questionnaire 2017-06-20 11:08:14 -04:00
eric e8ae2f1139 Merge branch 'master' into production 2017-06-14 09:56:16 -04:00
eshellman 99e38f73e0 Merge pull request #683 from Gluejar/update-facebook-api
update python social auth
2017-06-14 09:36:29 -04:00
eric 52f1544f58 update python social auth
needed to update python social auth because of facebook api version
deprecation and as a steppingstone to migrate to new modular PSA
2017-06-13 17:08:19 -04:00
eric 20ab81070b Merge branch 'master' into production 2017-06-12 18:50:05 -04:00
eshellman 506d4d87bd Merge pull request #682 from Gluejar/distro-admin
Re-enable distro admin
2017-06-12 18:32:20 -04:00
eric 73a2fb48c2 Re-enable distro admin 2017-06-12 15:40:57 -04:00
eric 846c6509f6 Merge branch 'master' into production 2017-06-12 14:23:11 -04:00
eshellman 8a4d404a52 Merge pull request #681 from Gluejar/fix-template-error
eliminate bad template errors
2017-06-12 13:51:58 -04:00
eric 75887aa789 eliminate bad template errors 2017-06-12 12:05:49 -04:00
eric aa23446ecf Merge branch 'master' into production 2017-05-19 14:34:34 -04:00
eshellman 576611c4dd Merge pull request #680 from Gluejar/fix-survey-headers
Fix survey export, add date column
2017-05-19 13:50:30 -04:00
eric 8d7b2f7417 add completion date column 2017-05-19 13:46:12 -04:00
eric 303c30a108 fix csv export 2017-05-18 10:47:13 -04:00
eric 5fb7538eea Merge branch 'master' into production 2017-05-09 22:38:38 -04:00
eshellman 2b72402b7d Merge pull request #679 from Gluejar/fix-b2u-s2k
add get_archive method to acq.mock_ebook
2017-05-08 17:31:33 -04:00
eric 0ea3fc1781 add get_archive method to acq.mock_ebook 2017-05-08 17:22:02 -04:00
eric 6d1bb10d0c Merge branch 'master' into production 2017-05-03 09:35:47 -04:00